diff -r 7b145ccff1e9 -r 3b08e6396b45 mysql/mysql.patch
--- a/mysql/mysql.patch	Tue Aug 28 18:28:40 2012 +0200
+++ b/mysql/mysql.patch	Tue Aug 28 18:28:45 2012 +0200
@@ -1,42 +1,7 @@
-Index: configure
---- 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
- 
--if test "$GCC" != "yes" || expr "$CC" : ".*icc.*"
-+if true
- then
-   ABI_CHECK=""
- else
-Index: include/Makefile.in
---- 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 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)
- 
-@@ -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 \
- 			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
 Index: mysys/default.c
---- 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 @@
+--- mysys/default.c.orig	2012-08-22 19:47:54.486251769 +0200
++++ mysys/default.c	2012-08-22 19:48:07.379075804 +0200
+@@ -1222,8 +1222,7 @@
  
  #else
  
@@ -46,25 +11,10 @@
  
  #if defined(DEFAULT_SYSCONFDIR)
    if (DEFAULT_SYSCONFDIR[0])
-Index: scripts/mysql_config.sh
---- 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 
- # We intentionally add a space to the beginning and end of lib strings, simplifies replace later
--libs=" $ldflags -L$pkglibdir -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@"
-+libs=" $ldflags -L$pkglibdir -lmysqlclient -lmysys @ZLIB_DEPS@ @NON_THREADED_LIBS@"
- 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 @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	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 @@
+--- scripts/mysql_system_tables_data.sql.orig	2012-08-22 19:49:42.514877593 +0200
++++ scripts/mysql_system_tables_data.sql	2012-08-22 19:49:52.671510387 +0200
+@@ -26,8 +26,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;
@@ -73,15 +23,3 @@
  INSERT INTO db SELECT * FROM tmp_db WHERE @had_db_table=0;
  DROP TABLE tmp_db;
  
-Index: sql/Makefile.in
---- 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
- 
- 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@ \