Index: include/Makefile.in
--- include/Makefile.in.orig	2007-09-24 12:32:02 +0200
+++ include/Makefile.in	2007-10-01 07:39:56 +0200
@@ -395,14 +395,14 @@
 			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 mysql/plugin.h my_attribute.h $(HEADERS_GEN)
+			m_ctype.h mysql/plugin.h my_attribute.h rijndael.h sha1.h my_aes.h $(HEADERS_GEN)
 
 noinst_HEADERS = config-win.h config-netware.h \
 			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 \
 			mysql_version.h.in my_handler.h my_time.h \
 			my_vle.h my_user.h my_atomic.h atomic/nolock.h \
Index: include/my_global.h
--- include/my_global.h.orig	2007-09-24 12:30:24 +0200
+++ include/my_global.h	2007-10-01 07:39:56 +0200
@@ -562,12 +562,6 @@
 #define PURIFY_OR_LINT_INIT(var)
 #endif
 
-/* Define some useful general macros */
-#if !defined(max)
-#define max(a, b)	((a) > (b) ? (a) : (b))
-#define min(a, b)	((a) < (b) ? (a) : (b))
-#endif
-
 #if !defined(HAVE_UINT)
 #undef HAVE_UINT
 #define HAVE_UINT
@@ -1508,4 +1502,10 @@
 /* Length of decimal number represented by INT64. */
 #define MY_INT64_NUM_DECIMAL_DIGITS 21
 
+/* Define some useful general macros */
+#if !defined(max)
+#define max(a, b)	((a) > (b) ? (a) : (b))
+#define min(a, b)	((a) < (b) ? (a) : (b))
+#endif
+
 #endif /* my_global_h */
Index: mysys/default.c
--- mysys/default.c.orig	2007-09-24 12:30:12 +0200
+++ mysys/default.c	2007-10-01 07:39:56 +0200
@@ -1012,8 +1012,7 @@
 #elif defined(__NETWARE__)
   *ptr++= "sys:/etc/";
 #else
-  *ptr++= "/etc/";
-  *ptr++= "/etc/mysql/";
+  *ptr++= "@l_prefix@/etc/mysql/";
 #endif
   if ((env= getenv(STRINGIFY_ARG(DEFAULT_HOME_ENV))))
     *ptr++= env;
Index: scripts/mysql_config.sh
--- scripts/mysql_config.sh.orig	2007-09-24 12:29:59 +0200
+++ scripts/mysql_config.sh	2007-10-01 07:39:56 +0200
@@ -97,9 +97,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 @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @innodb_system_libs@ @openssl_libs@ "
 
 cflags="-I$pkgincludedir @CFLAGS@ " #note: end space!
Index: scripts/mysql_system_tables_data.sql
--- scripts/mysql_system_tables_data.sql.orig	2007-09-24 12:29:43 +0200
+++ scripts/mysql_system_tables_data.sql	2007-10-01 07:39:56 +0200
@@ -5,8 +5,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;
-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');
-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');
 INSERT INTO db SELECT * FROM tmp_db WHERE @had_db_table=0;
 DROP TABLE tmp_db;
 
Index: sql/Makefile.in
--- sql/Makefile.in.orig	2007-09-24 12:32:16 +0200
+++ sql/Makefile.in	2007-10-01 07:39:56 +0200
@@ -512,7 +512,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@ \