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: 07-Feb-2009 19:55:12 Branch: HEAD Handle: 2009020718551200 Modified files: openpkg-src/mysql mysql.patch mysql.spec Log: upgrading package: mysql 5.1.30 -> 5.1.31 Summary: Revision Changes Path 1.32 +17 -16 openpkg-src/mysql/mysql.patch 1.182 +2 -2 openpkg-src/mysql/mysql.spec ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-src/mysql/mysql.patch ============================================================================ $ cvs diff -u -r1.31 -r1.32 mysql.patch --- openpkg-src/mysql/mysql.patch 28 Nov 2008 21:10:12 -0000 1.31 +++ openpkg-src/mysql/mysql.patch 7 Feb 2009 18:55:12 -0000 1.32 @@ -1,12 +1,13 @@ 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 @@ +--- include/Makefile.in.orig 2009-01-19 17:40:38 +0100 ++++ include/Makefile.in 2009-02-07 19:03:05 +0100 +@@ -387,15 +387,15 @@ 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) +- m_ctype.h my_attribute.h $(HEADERS_GEN_CONFIGURE) \ ++ m_ctype.h my_attribute.h rijndael.h sha1.h my_aes.h $(HEADERS_GEN_CONFIGURE) \ + $(HEADERS_GEN_MAKE) noinst_HEADERS = config-win.h config-netware.h my_bit.h \ heap.h my_bitmap.h my_uctype.h \ @@ -17,11 +18,11 @@ + 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_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-28 17:40:47 +0200 -+++ mysys/default.c 2008-09-13 18:38:09 +0200 +--- mysys/default.c.orig 2009-01-19 17:29:59 +0100 ++++ mysys/default.c 2009-02-07 18:38:28 +0100 @@ -1086,8 +1086,7 @@ #else @@ -33,8 +34,8 @@ #if defined(DEFAULT_SYSCONFDIR) if (DEFAULT_SYSCONFDIR != "") Index: scripts/mysql_config.sh ---- scripts/mysql_config.sh.orig 2008-08-28 17:40:52 +0200 -+++ scripts/mysql_config.sh 2008-09-13 18:34:54 +0200 +--- scripts/mysql_config.sh.orig 2009-01-19 17:30:55 +0100 ++++ scripts/mysql_config.sh 2009-02-07 19:05:12 +0100 @@ -104,9 +104,9 @@ # Create options @@ -44,12 +45,12 @@ libs="$libs @openssl_libs@ @STATIC_NSS_FLAGS@ " -libs_r=" $ldflags -L$pkglibdir -lmysqlclient_r @ZLIB_DEPS@ @LIBS@ @openssl_libs@ " +libs_r=" $ldflags -L$pkglibdir -lmysqlclient_r -lmysys @ZLIB_DEPS@ @LIBS@ @openssl_libs@ " - embedded_libs=" $ldflags -L$pkglibdir -lmysqld @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @innodb_system_libs@ @openssl_libs@ " + embedded_libs=" $ldflags -L$pkglibdir -lmysqld @LIBDL@ @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @innodb_system_libs@ @openssl_libs@ " if [ -r "$pkglibdir/libmygcc.a" ]; then Index: scripts/mysql_system_tables_data.sql ---- 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 +--- scripts/mysql_system_tables_data.sql.orig 2009-01-19 17:30:55 +0100 ++++ scripts/mysql_system_tables_data.sql 2009-02-07 18:38:28 +0100 @@ -11,8 +11,6 @@ -- Fill "db" table with default grants for anyone to -- access database 'test' and 'test_%' if "db" table didn't exist @@ -60,9 +61,9 @@ 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 @@ +--- sql/Makefile.in.orig 2009-01-19 17:40:45 +0100 ++++ sql/Makefile.in 2009-02-07 18:38:28 +0100 +@@ -520,7 +520,7 @@ $(top_builddir)/strings/libmystrings.a mysqld_DEPENDENCIES = @mysql_plugin_libs@ $(SUPPORTING_LIBS) libndb.la @@ . patch -p0 <<'@@ .' Index: openpkg-src/mysql/mysql.spec ============================================================================ $ cvs diff -u -r1.181 -r1.182 mysql.spec --- openpkg-src/mysql/mysql.spec 2 Jan 2009 10:47:31 -0000 1.181 +++ openpkg-src/mysql/mysql.spec 7 Feb 2009 18:55:12 -0000 1.182 @@ -23,7 +23,7 @@ # package version %define V_major 5.1 -%define V_minor 30 +%define V_minor 31 %define V_mysql %{V_major}.%{V_minor} %define V_opkg %{V_major}.%{V_minor} %define V_jdbc 5.1.7 @@ -39,7 +39,7 @@ Group: Database License: GPL Version: %{V_opkg} -Release: 20090102 +Release: 20090207 # package options %option with_server yes @@ . ______________________________________________________________________ OpenPKG http://openpkg.org CVS Repository Commit List [email protected]
