1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1.2 +++ b/mysql/mysql.patch Tue Aug 28 18:28:40 2012 +0200
1.3 @@ -0,0 +1,87 @@
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 +
1.44 + #else
1.45 +
1.46 +- errors += add_directory(alloc, "/etc/", dirs);
1.47 +- errors += add_directory(alloc, "/etc/mysql/", dirs);
1.48 ++ errors += add_directory(alloc, "@l_prefix@/etc/mysql/", dirs);
1.49 +
1.50 + #if defined(DEFAULT_SYSCONFDIR)
1.51 + if (DEFAULT_SYSCONFDIR[0])
1.52 +Index: scripts/mysql_config.sh
1.53 +--- scripts/mysql_config.sh.orig 2010-10-11 22:34:28.000000000 +0200
1.54 ++++ scripts/mysql_config.sh 2010-11-03 13:05:31.000000000 +0100
1.55 +@@ -104,9 +104,9 @@
1.56 +
1.57 + # Create options
1.58 + # We intentionally add a space to the beginning and end of lib strings, simplifies replace later
1.59 +-libs=" $ldflags -L$pkglibdir -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@"
1.60 ++libs=" $ldflags -L$pkglibdir -lmysqlclient -lmysys @ZLIB_DEPS@ @NON_THREADED_LIBS@"
1.61 + libs="$libs @openssl_libs@ @STATIC_NSS_FLAGS@ "
1.62 +-libs_r=" $ldflags -L$pkglibdir -lmysqlclient_r @ZLIB_DEPS@ @LIBS@ @openssl_libs@ "
1.63 ++libs_r=" $ldflags -L$pkglibdir -lmysqlclient_r -lmysys @ZLIB_DEPS@ @LIBS@ @openssl_libs@ "
1.64 + embedded_libs=" $ldflags -L$pkglibdir -lmysqld @LIBDL@ @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @innodb_system_libs@ @openssl_libs@ "
1.65 +
1.66 + if [ -r "$pkglibdir/libmygcc.a" ]; then
1.67 +Index: scripts/mysql_system_tables_data.sql
1.68 +--- scripts/mysql_system_tables_data.sql.orig 2010-10-11 22:34:29.000000000 +0200
1.69 ++++ scripts/mysql_system_tables_data.sql 2010-11-03 13:05:31.000000000 +0100
1.70 +@@ -11,8 +11,6 @@
1.71 + -- Fill "db" table with default grants for anyone to
1.72 + -- access database 'test' and 'test_%' if "db" table didn't exist
1.73 + CREATE TEMPORARY TABLE tmp_db LIKE db;
1.74 +-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');
1.75 +-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');
1.76 + INSERT INTO db SELECT * FROM tmp_db WHERE @had_db_table=0;
1.77 + DROP TABLE tmp_db;
1.78 +
1.79 +Index: sql/Makefile.in
1.80 +--- sql/Makefile.in.orig 2010-10-11 22:40:27.000000000 +0200
1.81 ++++ sql/Makefile.in 2010-11-03 13:05:31.000000000 +0100
1.82 +@@ -538,7 +538,7 @@
1.83 + $(top_builddir)/strings/libmystrings.a
1.84 +
1.85 + mysqld_DEPENDENCIES = @mysql_plugin_libs@ $(SUPPORTING_LIBS) libndb.la
1.86 +-LDADD = $(SUPPORTING_LIBS) @ZLIB_LIBS@ @NDB_SCI_LIBS@
1.87 ++LDADD = $(SUPPORTING_LIBS) @NDB_SCI_LIBS@
1.88 + mysqld_LDADD = libndb.la \
1.89 + @MYSQLD_EXTRA_LDFLAGS@ \
1.90 + @pstack_libs@ \
