michael@527: Index: configure
michael@527: --- configure.orig	2010-10-11 22:40:59.000000000 +0200
michael@527: +++ configure	2010-11-03 13:05:31.000000000 +0100
michael@527: @@ -19652,7 +19652,7 @@
michael@527:  
michael@527:  # Enable the abi_check rule only if gcc is available
michael@527:  
michael@527: -if test "$GCC" != "yes" || expr "$CC" : ".*icc.*"
michael@527: +if true
michael@527:  then
michael@527:    ABI_CHECK=""
michael@527:  else
michael@527: Index: include/Makefile.in
michael@527: --- include/Makefile.in.orig	2010-10-11 22:40:17.000000000 +0200
michael@527: +++ include/Makefile.in	2010-11-03 13:07:11.000000000 +0100
michael@527: @@ -405,7 +405,8 @@
michael@527:  			decimal.h errmsg.h my_global.h my_net.h \
michael@527:  			my_getopt.h sslopt-longopts.h my_dir.h \
michael@527:  			sslopt-vars.h sslopt-case.h sql_common.h keycache.h \
michael@527: -			m_ctype.h my_attribute.h my_compiler.h \
michael@527: +			m_ctype.h my_attribute.h my_compiler.h rijndael.h sha1.h \
michael@527: +			my_aes.h \
michael@527:  			$(HEADERS_GEN_CONFIGURE) \
michael@527:  			$(HEADERS_GEN_MAKE)
michael@527:  
michael@527: @@ -413,8 +414,7 @@
michael@527:  			heap.h my_bitmap.h my_uctype.h \
michael@527:  			myisam.h myisampack.h myisammrg.h ft_global.h\
michael@527:  			mysys_err.h my_base.h help_start.h help_end.h \
michael@527: -			my_nosys.h my_alarm.h queues.h rijndael.h sha1.h \
michael@527: -			my_aes.h my_tree.h my_trie.h hash.h thr_alarm.h \
michael@527: +			my_nosys.h my_alarm.h queues.h my_tree.h my_trie.h hash.h thr_alarm.h \
michael@527:  			thr_lock.h t_ctype.h violite.h my_md5.h base64.h \
michael@527:  			my_handler.h my_time.h my_vle.h my_user.h \
michael@527:  			my_libwrap.h my_stacktrace.h
michael@527: Index: mysys/default.c
michael@527: --- mysys/default.c.orig	2010-10-11 22:34:24.000000000 +0200
michael@527: +++ mysys/default.c	2010-11-03 13:05:31.000000000 +0100
michael@527: @@ -1123,8 +1123,7 @@
michael@527:  
michael@527:  #else
michael@527:  
michael@527: -  errors += add_directory(alloc, "/etc/", dirs);
michael@527: -  errors += add_directory(alloc, "/etc/mysql/", dirs);
michael@527: +  errors += add_directory(alloc, "@l_prefix@/etc/mysql/", dirs);
michael@527:  
michael@527:  #if defined(DEFAULT_SYSCONFDIR)
michael@527:    if (DEFAULT_SYSCONFDIR[0])
michael@527: Index: scripts/mysql_config.sh
michael@527: --- scripts/mysql_config.sh.orig	2010-10-11 22:34:28.000000000 +0200
michael@527: +++ scripts/mysql_config.sh	2010-11-03 13:05:31.000000000 +0100
michael@527: @@ -104,9 +104,9 @@
michael@527:  
michael@527:  # Create options 
michael@527:  # We intentionally add a space to the beginning and end of lib strings, simplifies replace later
michael@527: -libs=" $ldflags -L$pkglibdir -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@"
michael@527: +libs=" $ldflags -L$pkglibdir -lmysqlclient -lmysys @ZLIB_DEPS@ @NON_THREADED_LIBS@"
michael@527:  libs="$libs @openssl_libs@ @STATIC_NSS_FLAGS@ "
michael@527: -libs_r=" $ldflags -L$pkglibdir -lmysqlclient_r @ZLIB_DEPS@ @LIBS@ @openssl_libs@ "
michael@527: +libs_r=" $ldflags -L$pkglibdir -lmysqlclient_r -lmysys @ZLIB_DEPS@ @LIBS@ @openssl_libs@ "
michael@527:  embedded_libs=" $ldflags -L$pkglibdir -lmysqld @LIBDL@ @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @innodb_system_libs@ @openssl_libs@ "
michael@527:  
michael@527:  if [ -r "$pkglibdir/libmygcc.a" ]; then
michael@527: Index: scripts/mysql_system_tables_data.sql
michael@527: --- scripts/mysql_system_tables_data.sql.orig	2010-10-11 22:34:29.000000000 +0200
michael@527: +++ scripts/mysql_system_tables_data.sql	2010-11-03 13:05:31.000000000 +0100
michael@527: @@ -11,8 +11,6 @@
michael@527:  -- Fill "db" table with default grants for anyone to
michael@527:  -- access database 'test' and 'test_%' if "db" table didn't exist
michael@527:  CREATE TEMPORARY TABLE tmp_db LIKE db;
michael@527: -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');
michael@527: -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');
michael@527:  INSERT INTO db SELECT * FROM tmp_db WHERE @had_db_table=0;
michael@527:  DROP TABLE tmp_db;
michael@527:  
michael@527: Index: sql/Makefile.in
michael@527: --- sql/Makefile.in.orig	2010-10-11 22:40:27.000000000 +0200
michael@527: +++ sql/Makefile.in	2010-11-03 13:05:31.000000000 +0100
michael@527: @@ -538,7 +538,7 @@
michael@527:  			$(top_builddir)/strings/libmystrings.a
michael@527:  
michael@527:  mysqld_DEPENDENCIES = @mysql_plugin_libs@ $(SUPPORTING_LIBS) libndb.la
michael@527: -LDADD = $(SUPPORTING_LIBS) @ZLIB_LIBS@ @NDB_SCI_LIBS@
michael@527: +LDADD = $(SUPPORTING_LIBS) @NDB_SCI_LIBS@
michael@527:  mysqld_LDADD = libndb.la \
michael@527:  			@MYSQLD_EXTRA_LDFLAGS@ \
michael@527:  			@pstack_libs@ \