OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 11-Oct-2006 23:22:22
Branch: HEAD Handle: 2006101122222200
Modified files:
openpkg-src/mysql51 mysql51.patch
Log:
add back a patch hunk which was lost some time ago and which is
important for maximum portability as the libmysys contains fallback
implementations for some less portable functions used in
libmysqlclient
Summary:
Revision Changes Path
1.3 +22 -7 openpkg-src/mysql51/mysql51.patch
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/mysql51/mysql51.patch
============================================================================
$ cvs diff -u -r1.2 -r1.3 mysql51.patch
--- openpkg-src/mysql51/mysql51.patch 5 Jul 2006 09:27:22 -0000 1.2
+++ openpkg-src/mysql51/mysql51.patch 11 Oct 2006 21:22:22 -0000 1.3
@@ -1,6 +1,6 @@
Index: include/Makefile.in
--- include/Makefile.in.orig 2006-06-02 20:03:03 +0200
-+++ include/Makefile.in 2006-07-05 11:12:33 +0200
++++ include/Makefile.in 2006-10-11 23:06:15 +0200
@@ -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 \
@@ -20,9 +20,9 @@
mysql_version.h.in my_handler.h my_time.h decimal.h \
my_vle.h my_user.h
Index: include/my_global.h
---- include/my_global.h.orig 2006-02-27 22:24:47 +0100
-+++ include/my_global.h 2006-03-11 13:35:05 +0100
-@@ -819,9 +819,8 @@
+--- 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)
#endif
@@ -35,7 +35,7 @@
#ifndef M_PI
Index: mysys/default.c
--- mysys/default.c.orig 2006-06-02 20:00:52 +0200
-+++ mysys/default.c 2006-07-05 10:45:08 +0200
++++ mysys/default.c 2006-10-11 23:06:15 +0200
@@ -1001,7 +1001,7 @@
#elif defined(__NETWARE__)
*ptr++= "sys:/etc/";
@@ -45,9 +45,24 @@
#endif
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
+@@ -98,9 +98,9 @@
+
+ # Create options
+ # We intentionally add a space to the beginning 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@"
+
+ cflags="-I$pkgincludedir @CFLAGS@ " #note: end space!
Index: scripts/mysql_create_system_tables.sh
---- scripts/mysql_create_system_tables.sh.orig 2006-02-27 22:25:28
+0100
-+++ scripts/mysql_create_system_tables.sh 2006-03-11 13:40:53 +0100
+--- 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
@@ -81,9 +81,6 @@
c_d="$c_d ) engine=MyISAM"
c_d="$c_d CHARACTER SET utf8 COLLATE utf8_bin"
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
