1.1 --- a/mysql/mysql.patch Tue Aug 28 18:28:40 2012 +0200
1.2 +++ b/mysql/mysql.patch Tue Aug 28 18:28:45 2012 +0200
1.3 @@ -1,42 +1,7 @@
1.4 -Index: configure
1.5 ---- configure.orig 2010-10-11 22:40:59.000000000 +0200
1.6 -+++ configure 2010-11-03 13:05:31.000000000 +0100
1.7 -@@ -19652,7 +19652,7 @@
1.8 -
1.9 - # Enable the abi_check rule only if gcc is available
1.10 -
1.11 --if test "$GCC" != "yes" || expr "$CC" : ".*icc.*"
1.12 -+if true
1.13 - then
1.14 - ABI_CHECK=""
1.15 - else
1.16 -Index: include/Makefile.in
1.17 ---- include/Makefile.in.orig 2010-10-11 22:40:17.000000000 +0200
1.18 -+++ include/Makefile.in 2010-11-03 13:07:11.000000000 +0100
1.19 -@@ -405,7 +405,8 @@
1.20 - decimal.h errmsg.h my_global.h my_net.h \
1.21 - my_getopt.h sslopt-longopts.h my_dir.h \
1.22 - sslopt-vars.h sslopt-case.h sql_common.h keycache.h \
1.23 -- m_ctype.h my_attribute.h my_compiler.h \
1.24 -+ m_ctype.h my_attribute.h my_compiler.h rijndael.h sha1.h \
1.25 -+ my_aes.h \
1.26 - $(HEADERS_GEN_CONFIGURE) \
1.27 - $(HEADERS_GEN_MAKE)
1.28 -
1.29 -@@ -413,8 +414,7 @@
1.30 - heap.h my_bitmap.h my_uctype.h \
1.31 - myisam.h myisampack.h myisammrg.h ft_global.h\
1.32 - mysys_err.h my_base.h help_start.h help_end.h \
1.33 -- my_nosys.h my_alarm.h queues.h rijndael.h sha1.h \
1.34 -- my_aes.h my_tree.h my_trie.h hash.h thr_alarm.h \
1.35 -+ my_nosys.h my_alarm.h queues.h my_tree.h my_trie.h hash.h thr_alarm.h \
1.36 - thr_lock.h t_ctype.h violite.h my_md5.h base64.h \
1.37 - my_handler.h my_time.h my_vle.h my_user.h \
1.38 - my_libwrap.h my_stacktrace.h
1.39 Index: mysys/default.c
1.40 ---- mysys/default.c.orig 2010-10-11 22:34:24.000000000 +0200
1.41 -+++ mysys/default.c 2010-11-03 13:05:31.000000000 +0100
1.42 -@@ -1123,8 +1123,7 @@
1.43 +--- mysys/default.c.orig 2012-08-22 19:47:54.486251769 +0200
1.44 ++++ mysys/default.c 2012-08-22 19:48:07.379075804 +0200
1.45 +@@ -1222,8 +1222,7 @@
1.46
1.47 #else
1.48
1.49 @@ -46,25 +11,10 @@
1.50
1.51 #if defined(DEFAULT_SYSCONFDIR)
1.52 if (DEFAULT_SYSCONFDIR[0])
1.53 -Index: scripts/mysql_config.sh
1.54 ---- scripts/mysql_config.sh.orig 2010-10-11 22:34:28.000000000 +0200
1.55 -+++ scripts/mysql_config.sh 2010-11-03 13:05:31.000000000 +0100
1.56 -@@ -104,9 +104,9 @@
1.57 -
1.58 - # Create options
1.59 - # We intentionally add a space to the beginning and end of lib strings, simplifies replace later
1.60 --libs=" $ldflags -L$pkglibdir -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@"
1.61 -+libs=" $ldflags -L$pkglibdir -lmysqlclient -lmysys @ZLIB_DEPS@ @NON_THREADED_LIBS@"
1.62 - libs="$libs @openssl_libs@ @STATIC_NSS_FLAGS@ "
1.63 --libs_r=" $ldflags -L$pkglibdir -lmysqlclient_r @ZLIB_DEPS@ @LIBS@ @openssl_libs@ "
1.64 -+libs_r=" $ldflags -L$pkglibdir -lmysqlclient_r -lmysys @ZLIB_DEPS@ @LIBS@ @openssl_libs@ "
1.65 - embedded_libs=" $ldflags -L$pkglibdir -lmysqld @LIBDL@ @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @innodb_system_libs@ @openssl_libs@ "
1.66 -
1.67 - if [ -r "$pkglibdir/libmygcc.a" ]; then
1.68 Index: scripts/mysql_system_tables_data.sql
1.69 ---- scripts/mysql_system_tables_data.sql.orig 2010-10-11 22:34:29.000000000 +0200
1.70 -+++ scripts/mysql_system_tables_data.sql 2010-11-03 13:05:31.000000000 +0100
1.71 -@@ -11,8 +11,6 @@
1.72 +--- scripts/mysql_system_tables_data.sql.orig 2012-08-22 19:49:42.514877593 +0200
1.73 ++++ scripts/mysql_system_tables_data.sql 2012-08-22 19:49:52.671510387 +0200
1.74 +@@ -26,8 +26,6 @@
1.75 -- Fill "db" table with default grants for anyone to
1.76 -- access database 'test' and 'test_%' if "db" table didn't exist
1.77 CREATE TEMPORARY TABLE tmp_db LIKE db;
1.78 @@ -73,15 +23,3 @@
1.79 INSERT INTO db SELECT * FROM tmp_db WHERE @had_db_table=0;
1.80 DROP TABLE tmp_db;
1.81
1.82 -Index: sql/Makefile.in
1.83 ---- sql/Makefile.in.orig 2010-10-11 22:40:27.000000000 +0200
1.84 -+++ sql/Makefile.in 2010-11-03 13:05:31.000000000 +0100
1.85 -@@ -538,7 +538,7 @@
1.86 - $(top_builddir)/strings/libmystrings.a
1.87 -
1.88 - mysqld_DEPENDENCIES = @mysql_plugin_libs@ $(SUPPORTING_LIBS) libndb.la
1.89 --LDADD = $(SUPPORTING_LIBS) @ZLIB_LIBS@ @NDB_SCI_LIBS@
1.90 -+LDADD = $(SUPPORTING_LIBS) @NDB_SCI_LIBS@
1.91 - mysqld_LDADD = libndb.la \
1.92 - @MYSQLD_EXTRA_LDFLAGS@ \
1.93 - @pstack_libs@ \
