OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 28-Nov-2008 22:10:13
Branch: HEAD Handle: 2008112821101201
Modified files:
openpkg-src/mysql my.cnf mysql.patch mysql.spec
Log:
upgrade to MySQL 5.1
Summary:
Revision Changes Path
1.14 +0 -6 openpkg-src/mysql/my.cnf
1.31 +46 -12 openpkg-src/mysql/mysql.patch
1.180 +35 -31 openpkg-src/mysql/mysql.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/mysql/my.cnf
============================================================================
$ cvs diff -u -r1.13 -r1.14 my.cnf
--- openpkg-src/mysql/my.cnf 13 Apr 2007 08:48:18 -0000 1.13
+++ openpkg-src/mysql/my.cnf 28 Nov 2008 21:10:12 -0000 1.14
@@ -36,12 +36,6 @@
query_cache_size = 32M
ft_min_word_len = 3
-<with_bdb>
-bdb_cache_size = 8M
-bdb_log_buffer_size = 32k
-bdb_max_lock = 10000
-
-</with_bdb>
<with_innobase>
innodb_buffer_pool_size = 70M
innodb_additional_mem_pool_size = 2M
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mysql/mysql.patch
============================================================================
$ cvs diff -u -r1.30 -r1.31 mysql.patch
--- openpkg-src/mysql/mysql.patch 9 Aug 2008 16:50:52 -0000 1.30
+++ openpkg-src/mysql/mysql.patch 28 Nov 2008 21:10:12 -0000 1.31
@@ -1,19 +1,41 @@
+Index: include/Makefile.in
+--- include/Makefile.in.orig 2008-08-28 17:43:15 +0200
++++ include/Makefile.in 2008-09-13 18:34:54 +0200
+@@ -394,14 +394,14 @@
+ decimal.h errmsg.h my_global.h my_net.h \
+ my_getopt.h sslopt-longopts.h my_dir.h \
+ sslopt-vars.h sslopt-case.h sql_common.h keycache.h \
+- m_ctype.h my_attribute.h $(HEADERS_GEN)
++ m_ctype.h my_attribute.h rijndael.h sha1.h my_aes.h
$(HEADERS_GEN)
+
+ noinst_HEADERS = config-win.h config-netware.h my_bit.h \
+ heap.h my_bitmap.h my_uctype.h \
+ myisam.h myisampack.h myisammrg.h ft_global.h\
+ mysys_err.h my_base.h help_start.h help_end.h \
+- my_nosys.h my_alarm.h queues.h rijndael.h sha1.h \
+- my_aes.h my_tree.h my_trie.h hash.h thr_alarm.h \
++ my_nosys.h my_alarm.h queues.h \
++ my_tree.h my_trie.h hash.h thr_alarm.h \
+ thr_lock.h t_ctype.h violite.h my_md5.h base64.h \
+ mysql_version.h.in my_handler.h my_time.h \
+ my_vle.h my_user.h my_atomic.h atomic/nolock.h \
Index: mysys/default.c
---- mysys/default.c.orig 2008-08-04 14:19:45 +0200
-+++ mysys/default.c 2008-08-09 15:16:21 +0200
-@@ -1077,7 +1077,7 @@
+--- mysys/default.c.orig 2008-08-28 17:40:47 +0200
++++ mysys/default.c 2008-09-13 18:38:09 +0200
+@@ -1086,8 +1086,7 @@
#else
- errors += add_directory(alloc, "/etc/", dirs);
+- errors += add_directory(alloc, "/etc/mysql/", dirs);
+ errors += add_directory(alloc, "@l_prefix@/etc/mysql/", dirs);
- #if defined(__EMX__) || defined(OS2)
- if ((env= getenv("ETC")))
+ #if defined(DEFAULT_SYSCONFDIR)
+ if (DEFAULT_SYSCONFDIR != "")
Index: scripts/mysql_config.sh
---- scripts/mysql_config.sh.orig 2008-08-04 14:20:01 +0200
-+++ scripts/mysql_config.sh 2008-08-09 11:38:36 +0200
-@@ -102,9 +102,9 @@
+--- scripts/mysql_config.sh.orig 2008-08-28 17:40:52 +0200
++++ scripts/mysql_config.sh 2008-09-13 18:34:54 +0200
+@@ -104,9 +104,9 @@
# Create options
# We intentionally add a space to the beginning and end of lib strings,
simplifies replace later
@@ -26,14 +48,26 @@
if [ -r "$pkglibdir/libmygcc.a" ]; then
Index: scripts/mysql_system_tables_data.sql
---- scripts/mysql_system_tables_data.sql.orig 2008-08-04 14:20:02
+0200
-+++ scripts/mysql_system_tables_data.sql 2008-08-09 11:38:36 +0200
+--- scripts/mysql_system_tables_data.sql.orig 2008-08-28 17:40:52
+0200
++++ scripts/mysql_system_tables_data.sql 2008-09-13 18:34:54 +0200
@@ -11,8 +11,6 @@
-- Fill "db" table with default grants for anyone to
-- access database 'test' and 'test_%' if "db" table didn't exist
CREATE TEMPORARY TABLE tmp_db LIKE db;
--INSERT INTO tmp_db VALUES
('%','test','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y','Y','Y','Y','N','N');
--INSERT INTO tmp_db VALUES
('%','test\_%','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y','Y','Y','Y','N','N');
+-INSERT INTO tmp_db VALUES
('%','test','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y','Y','Y','Y','N','N','Y','Y');
+-INSERT INTO tmp_db VALUES
('%','test\_%','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y','Y','Y','Y','N','N','Y','Y');
INSERT INTO db SELECT * FROM tmp_db WHERE @had_db_table=0;
DROP TABLE tmp_db;
+Index: sql/Makefile.in
+--- sql/Makefile.in.orig 2008-08-28 17:43:23 +0200
++++ sql/Makefile.in 2008-09-13 18:34:54 +0200
+@@ -517,7 +517,7 @@
+ $(top_builddir)/strings/libmystrings.a
+
+ mysqld_DEPENDENCIES = @mysql_plugin_libs@ $(SUPPORTING_LIBS) libndb.la
+-LDADD = $(SUPPORTING_LIBS) @ZLIB_LIBS@ @NDB_SCI_LIBS@
++LDADD = $(SUPPORTING_LIBS) @NDB_SCI_LIBS@
+ mysqld_LDADD = libndb.la \
+ @MYSQLD_EXTRA_LDFLAGS@ \
+ @pstack_libs@ \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mysql/mysql.spec
============================================================================
$ cvs diff -u -r1.179 -r1.180 mysql.spec
--- openpkg-src/mysql/mysql.spec 9 Aug 2008 16:50:52 -0000 1.179
+++ openpkg-src/mysql/mysql.spec 28 Nov 2008 21:10:13 -0000 1.180
@@ -22,11 +22,11 @@
##
# package version
-%define V_major 5.0
-%define V_minor 67
+%define V_major 5.1
+%define V_minor 30
%define V_mysql %{V_major}.%{V_minor}
%define V_opkg %{V_major}.%{V_minor}
-%define V_jdbc 5.0.8
+%define V_jdbc 5.1.7
# package information
Name: mysql
@@ -39,22 +39,28 @@
Group: Database
License: GPL
Version: %{V_opkg}
-Release: 20080809
+Release: 20081128
# package options
%option with_server yes
-%option with_bdb yes
%option with_innobase yes
%option with_archive no
%option with_blackhole no
%option with_federated no
%option with_ndbcluster no
+%option with_partition no
%option with_ssl no
%option with_embedded no
%option with_charset utf8
%option with_collation utf8_unicode_ci
%option with_jdbc no
+# fixing implicit inter-plugin dependencies and correlations
+%if "%{with_ndbcluster}" == "yes"
+%undefine with_partition
+%define with_partition yes
+%endif
+
# list of sources
Source0:
http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-%{V_major}/mysql-%{V_mysql}.tar.gz
Source1:
http://ftp.gwdg.de/pub/misc/mysql/Downloads/Connector-J/mysql-connector-java-%{V_jdbc}.tar.gz
@@ -80,6 +86,7 @@
%endif
AutoReq: no
AutoReqProv: no
+Provides: mysql = %{version}-%{release}
%description
MySQL is a multi-user Relational Database Management System (RDBMS),
@@ -127,7 +134,8 @@
CFLAGS="%{l_cflags -O}" \
CXXFLAGS="%{l_cxxflags -O}" \
CPPFLAGS="%{l_cppflags ncurses}" \
- LDFLAGS="-L`pwd`/bdb/build_unix -L`pwd`/libmysql %{l_ldflags}" \
+ LDFLAGS="-L`pwd`/libmysql %{l_ldflags}" \
+ LIBS="-lz" \
./configure \
--prefix=%{l_prefix} \
--sysconfdir=%{l_prefix}/etc/mysql \
@@ -141,43 +149,44 @@
--without-server \
%else
--with-server \
- --with-csv-storage-engine \
-%if "%{with_bdb}" == "yes"
- --with-berkeley-db \
-%else
- --without-berkeley-db \
-%endif
+ --with-plugin-csv \
+ --with-plugin-heap \
+ --with-plugin-myisam \
+ --with-plugin-myisammrg \
%if "%{with_innobase}" == "yes"
- --with-innodb \
+ --with-plugin-innobase \
%else
- --without-innodb \
+ --without-plugin-innobase \
%endif
%if "%{with_archive}" == "yes"
- --with-archive-storage-engine \
+ --with-plugin-archive \
%else
- --without-archive-storage-engine \
+ --without-plugin-archive \
%endif
%if "%{with_blackhole}" == "yes"
- --with-blackhole-storage-engine \
+ --with-plugin-blackhole \
%else
- --without-blackhole-storage-engine \
+ --without-plugin-blackhole \
%endif
%if "%{with_federated}" == "yes"
- --with-federated-storage-engine \
+ --with-plugin-federated \
%else
- --without-federated-storage-engine \
+ --without-plugin-federated \
%endif
%if "%{with_ndbcluster}" == "yes"
- --with-ndbcluster \
- --with-ndb-shm \
+ --with-plugin-ndbcluster \
%else
- --without-ndbcluster \
+ --without-plugin-ndbcluster \
+%endif
+%if "%{with_partition}" == "yes"
+ --with-plugin-partition \
+%else
+ --without-plugin-partition \
%endif
%endif
+ --with-zlib-dir=%{l_prefix} \
%if "%{with_ssl}" == "yes"
- --with-openssl \
- --with-openssl-includes=%{l_prefix}/include \
- --with-openssl-libs=%{l_prefix}/lib \
+ --with-ssl=%{l_prefix} \
%endif
%if "%{with_embedded}" == "yes"
--with-embedded-server \
@@ -239,11 +248,6 @@
# install global configuration
%{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/mysql
sed <%{SOURCE my.cnf} >my.cnf \
-%if "%{with_bdb}" == "yes"
- -e '/<\/\{0,1\}with_bdb>/d' \
-%else
- -e '/<with_bdb>/,/<\/with_bdb>/d' \
-%endif
%if "%{with_innobase}" == "yes"
-e '/<\/\{0,1\}with_innobase>/d'
%else
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
