|
|
@@ -1,6 +1,6 @@
|
|
|
Index: include/Makefile.in
|
|
|
---- include/Makefile.in.orig 2006-06-02 20:03:03 +0200
|
|
|
-+++ include/Makefile.in 2006-10-11 23:06:15 +0200
|
|
|
+--- include/Makefile.in.orig 2006-10-26 14:03:01 +0200
|
|
|
++++ include/Makefile.in 2006-11-03 09:00:25 +0100
|
|
|
@@ -379,14 +379,14 @@
|
|
|
errmsg.h my_global.h my_net.h my_alloc.h \
|
|
|
my_getopt.h sslopt-longopts.h my_dir.h typelib.h \
|
|
|
@@ -18,12 +18,12 @@ Index: include/Makefile.in
|
|
|
+ my_tree.h my_trie.h hash.h thr_alarm.h \
|
|
|
thr_lock.h t_ctype.h violite.h md5.h base64.h \
|
|
|
mysql_version.h.in my_handler.h my_time.h decimal.h \
|
|
|
- my_vle.h my_user.h
|
|
|
+ my_vle.h my_user.h my_atomic.h atomic/nolock.h \
|
|
|
Index: include/my_global.h
|
|
|
---- include/my_global.h.orig 2006-06-02 20:00:41 +0200
|
|
|
-+++ include/my_global.h 2006-10-11 23:06:15 +0200
|
|
|
-@@ -788,9 +788,8 @@
|
|
|
- #define FLT_MAX ((float)3.40282346638528860e+38)
|
|
|
+--- include/my_global.h.orig 2006-10-26 14:01:59 +0200
|
|
|
++++ include/my_global.h 2006-11-03 09:00:25 +0100
|
|
|
+@@ -844,9 +844,8 @@
|
|
|
+ #define SSIZE_MAX ((~((size_t) 0)) / 2)
|
|
|
#endif
|
|
|
|
|
|
-#if !defined(HAVE_ISINF) && !defined(isinf)
|
|
|
@@ -34,9 +34,9 @@ Index: include/my_global.h
|
|
|
/* Define missing math constants. */
|
|
|
#ifndef M_PI
|
|
|
Index: mysys/default.c
|
|
|
---- mysys/default.c.orig 2006-06-02 20:00:52 +0200
|
|
|
-+++ mysys/default.c 2006-10-11 23:06:15 +0200
|
|
|
-@@ -1001,7 +1001,7 @@
|
|
|
+--- mysys/default.c.orig 2006-10-26 14:01:57 +0200
|
|
|
++++ mysys/default.c 2006-11-03 09:00:25 +0100
|
|
|
+@@ -1011,7 +1011,7 @@
|
|
|
#elif defined(__NETWARE__)
|
|
|
*ptr++= "sys:/etc/";
|
|
|
#else
|
|
|
@@ -46,23 +46,23 @@ Index: mysys/default.c
|
|
|
if ((env= getenv(STRINGIFY_ARG(DEFAULT_HOME_ENV))))
|
|
|
*ptr++= env;
|
|
|
Index: scripts/mysql_config.sh
|
|
|
---- scripts/mysql_config.sh.orig 2006-06-02 20:00:53 +0200
|
|
|
-+++ scripts/mysql_config.sh 2006-10-11 23:06:15 +0200
|
|
|
+--- scripts/mysql_config.sh.orig 2006-10-26 14:01:56 +0200
|
|
|
++++ scripts/mysql_config.sh 2006-11-03 09:00:25 +0100
|
|
|
@@ -98,9 +98,9 @@
|
|
|
|
|
|
# Create options
|
|
|
- # We intentionally add a space to the beginning of lib strings, simplifies replace later
|
|
|
+ # 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@"
|
|
|
+ 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_create_system_tables.sh
|
|
|
---- scripts/mysql_create_system_tables.sh.orig 2006-06-02 20:01:33 +0200
|
|
|
-+++ scripts/mysql_create_system_tables.sh 2006-10-11 23:06:15 +0200
|
|
|
+--- scripts/mysql_create_system_tables.sh.orig 2006-10-26 14:01:50 +0200
|
|
|
++++ scripts/mysql_create_system_tables.sh 2006-11-03 09:00:25 +0100
|
|
|
@@ -81,9 +81,6 @@
|
|
|
c_d="$c_d ) engine=MyISAM"
|
|
|
c_d="$c_d CHARACTER SET utf8 COLLATE utf8_bin"
|
|
|
@@ -93,3 +93,15 @@ Index: scripts/mysql_create_system_tables.sh
|
|
|
else
|
|
|
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-10-26 14:03:10 +0200
|
|
|
++++ sql/Makefile.in 2006-11-03 09:02:32 +0100
|
|
|
+@@ -490,7 +490,7 @@
|
|
|
+ $(top_builddir)/mysys/libmysys.a \
|
|
|
+ $(top_builddir)/dbug/libdbug.a \
|
|
|
+ $(top_builddir)/regex/libregex.a \
|
|
|
+- $(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@
|
|
|
++ $(top_builddir)/strings/libmystrings.a
|
|
|
+
|
|
|
+ mysqld_DEPENDENCIES = @mysql_plugin_libs@ $(LDADD)
|
|
|
+ mysqld_LDADD = @MYSQLD_EXTRA_LDFLAGS@ \
|
