|
|
@@ -1,6 +1,6 @@
|
|
|
Index: include/Makefile.in
|
|
|
---- include/Makefile.in.orig 2006-12-06 18:06:46 +0100
|
|
|
-+++ include/Makefile.in 2006-12-12 19:30:39 +0100
|
|
|
+--- include/Makefile.in.orig 2007-01-30 09:35:30 +0100
|
|
|
++++ include/Makefile.in 2007-02-07 08:54:33 +0100
|
|
|
@@ -393,14 +393,14 @@
|
|
|
errmsg.h my_global.h my_net.h \
|
|
|
my_getopt.h sslopt-longopts.h my_dir.h \
|
|
|
@@ -20,9 +20,9 @@ Index: include/Makefile.in
|
|
|
mysql_version.h.in my_handler.h my_time.h decimal.h \
|
|
|
my_vle.h my_user.h my_atomic.h atomic/nolock.h \
|
|
|
Index: include/my_global.h
|
|
|
---- include/my_global.h.orig 2006-12-06 18:05:38 +0100
|
|
|
-+++ include/my_global.h 2006-12-12 18:46:44 +0100
|
|
|
-@@ -844,9 +844,8 @@
|
|
|
+--- include/my_global.h.orig 2007-01-30 09:34:31 +0100
|
|
|
++++ include/my_global.h 2007-02-07 08:54:33 +0100
|
|
|
+@@ -876,9 +876,8 @@
|
|
|
#define SSIZE_MAX ((~((size_t) 0)) / 2)
|
|
|
#endif
|
|
|
|
|
|
@@ -34,21 +34,22 @@ Index: include/my_global.h
|
|
|
/* Define missing math constants. */
|
|
|
#ifndef M_PI
|
|
|
Index: mysys/default.c
|
|
|
---- mysys/default.c.orig 2006-12-06 18:05:36 +0100
|
|
|
-+++ mysys/default.c 2006-12-12 18:46:44 +0100
|
|
|
-@@ -1011,7 +1011,7 @@
|
|
|
+--- mysys/default.c.orig 2007-01-30 09:34:13 +0100
|
|
|
++++ mysys/default.c 2007-02-07 08:56:38 +0100
|
|
|
+@@ -1011,8 +1011,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 2006-12-06 18:05:26 +0100
|
|
|
-+++ scripts/mysql_config.sh 2006-12-12 18:46:44 +0100
|
|
|
-@@ -98,9 +98,9 @@
|
|
|
+--- scripts/mysql_config.sh.orig 2007-01-30 09:34:12 +0100
|
|
|
++++ scripts/mysql_config.sh 2007-02-07 08:54:33 +0100
|
|
|
+@@ -97,9 +97,9 @@
|
|
|
|
|
|
# Create options
|
|
|
# We intentionally add a space to the beginning and end of lib strings, simplifies replace later
|
|
|
@@ -61,9 +62,9 @@ Index: scripts/mysql_config.sh
|
|
|
|
|
|
cflags="-I$pkgincludedir @CFLAGS@ " #note: end space!
|
|
|
Index: scripts/mysql_create_system_tables.sh
|
|
|
---- scripts/mysql_create_system_tables.sh.orig 2006-12-06 18:05:24 +0100
|
|
|
-+++ scripts/mysql_create_system_tables.sh 2006-12-12 18:46:44 +0100
|
|
|
-@@ -81,9 +81,6 @@
|
|
|
+--- scripts/mysql_create_system_tables.sh.orig 2007-01-30 09:34:03 +0100
|
|
|
++++ scripts/mysql_create_system_tables.sh 2007-02-07 08:54:33 +0100
|
|
|
+@@ -94,9 +94,6 @@
|
|
|
c_d="$c_d ) engine=MyISAM"
|
|
|
c_d="$c_d CHARACTER SET utf8 COLLATE utf8_bin"
|
|
|
c_d="$c_d comment='Database privileges';"
|
|
|
@@ -73,7 +74,7 @@ Index: scripts/mysql_create_system_tables.sh
|
|
|
fi
|
|
|
|
|
|
if test ! -f $mdata/host.frm
|
|
|
-@@ -174,17 +171,13 @@
|
|
|
+@@ -187,17 +184,13 @@
|
|
|
then
|
|
|
i_u="INSERT INTO user VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0);
|
|
|
INSERT INTO user VALUES ('$hostname','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0);
|
|
|
@@ -94,9 +95,9 @@ Index: scripts/mysql_create_system_tables.sh
|
|
|
i_u="$i_u
|
|
|
INSERT INTO user VALUES ('localhost','','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0);"
|
|
|
Index: sql/Makefile.in
|
|
|
---- sql/Makefile.in.orig 2006-12-06 18:06:54 +0100
|
|
|
-+++ sql/Makefile.in 2006-12-12 19:31:27 +0100
|
|
|
-@@ -503,7 +503,7 @@
|
|
|
+--- sql/Makefile.in.orig 2007-01-30 09:35:40 +0100
|
|
|
++++ sql/Makefile.in 2007-02-07 08:54:33 +0100
|
|
|
+@@ -501,7 +501,7 @@
|
|
|
$(top_builddir)/strings/libmystrings.a
|
|
|
|
|
|
mysqld_DEPENDENCIES = @mysql_plugin_libs@ $(SUPPORTING_LIBS)
|
