diff --git a/mysql/mysql.patch b/mysql/mysql.patch index 8dffc2723f..1bc8a5f559 100644 --- a/mysql/mysql.patch +++ b/mysql/mysql.patch @@ -1,6 +1,6 @@ Index: configure ---- configure.orig 2010-08-03 19:29:24.000000000 +0200 -+++ configure 2010-09-09 19:46:39.000000000 +0200 +--- configure.orig 2010-10-11 22:40:59.000000000 +0200 ++++ configure 2010-11-03 13:05:31.000000000 +0100 @@ -19652,7 +19652,7 @@ # Enable the abi_check rule only if gcc is available @@ -11,35 +11,31 @@ Index: configure ABI_CHECK="" else Index: include/Makefile.in ---- include/Makefile.in.orig 2010-08-03 19:28:49.000000000 +0200 -+++ include/Makefile.in 2010-09-09 19:47:24.000000000 +0200 -@@ -405,18 +405,18 @@ +--- include/Makefile.in.orig 2010-10-11 22:40:17.000000000 +0200 ++++ include/Makefile.in 2010-11-03 13:07:11.000000000 +0100 +@@ -405,7 +405,8 @@ 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_CONFIGURE) \ -- $(HEADERS_GEN_MAKE) -+ m_ctype.h my_attribute.h rijndael.h sha1.h my_aes.h $(HEADERS_GEN_CONFIGURE) \ -+ $(HEADERS_GEN_MAKE) my_compiler.h +- m_ctype.h my_attribute.h my_compiler.h \ ++ m_ctype.h my_attribute.h my_compiler.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 \ +@@ -413,8 +414,7 @@ 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 \ ++ 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 \ my_handler.h my_time.h my_vle.h my_user.h \ -- my_libwrap.h my_stacktrace.h my_compiler.h -+ my_libwrap.h my_stacktrace.h - - EXTRA_DIST = mysql.h.pp mysql/plugin.h.pp - + my_libwrap.h my_stacktrace.h Index: mysys/default.c ---- mysys/default.c.orig 2010-08-03 19:24:26.000000000 +0200 -+++ mysys/default.c 2010-09-09 19:46:39.000000000 +0200 +--- mysys/default.c.orig 2010-10-11 22:34:24.000000000 +0200 ++++ mysys/default.c 2010-11-03 13:05:31.000000000 +0100 @@ -1123,8 +1123,7 @@ #else @@ -51,8 +47,8 @@ Index: mysys/default.c #if defined(DEFAULT_SYSCONFDIR) if (DEFAULT_SYSCONFDIR[0]) Index: scripts/mysql_config.sh ---- scripts/mysql_config.sh.orig 2010-08-03 19:24:30.000000000 +0200 -+++ scripts/mysql_config.sh 2010-09-09 19:46:39.000000000 +0200 +--- scripts/mysql_config.sh.orig 2010-10-11 22:34:28.000000000 +0200 ++++ scripts/mysql_config.sh 2010-11-03 13:05:31.000000000 +0100 @@ -104,9 +104,9 @@ # Create options @@ -66,8 +62,8 @@ Index: scripts/mysql_config.sh if [ -r "$pkglibdir/libmygcc.a" ]; then Index: scripts/mysql_system_tables_data.sql ---- scripts/mysql_system_tables_data.sql.orig 2010-08-03 19:24:30.000000000 +0200 -+++ scripts/mysql_system_tables_data.sql 2010-09-09 19:46:39.000000000 +0200 +--- scripts/mysql_system_tables_data.sql.orig 2010-10-11 22:34:29.000000000 +0200 ++++ scripts/mysql_system_tables_data.sql 2010-11-03 13:05:31.000000000 +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 @@ -78,8 +74,8 @@ Index: scripts/mysql_system_tables_data.sql DROP TABLE tmp_db; Index: sql/Makefile.in ---- sql/Makefile.in.orig 2010-08-03 19:28:55.000000000 +0200 -+++ sql/Makefile.in 2010-09-09 19:46:39.000000000 +0200 +--- sql/Makefile.in.orig 2010-10-11 22:40:27.000000000 +0200 ++++ sql/Makefile.in 2010-11-03 13:05:31.000000000 +0100 @@ -538,7 +538,7 @@ $(top_builddir)/strings/libmystrings.a diff --git a/mysql/mysql.spec b/mysql/mysql.spec index 71da2418db..a76817cce6 100644 --- a/mysql/mysql.spec +++ b/mysql/mysql.spec @@ -23,7 +23,7 @@ # package version %define V_major 5.1 -%define V_minor 50 +%define V_minor 52 %define V_mysql %{V_major}.%{V_minor} %define V_opkg %{V_major}.%{V_minor} %define V_jdbc 5.1.13 @@ -39,7 +39,7 @@ Class: BASE Group: Database License: GPL Version: %{V_opkg} -Release: 20100909 +Release: 20101103 # package options %option with_server yes