SOURCES (DEVEL): mysql-libs.patch, mysql-c++.patch, mysql-client-c...

[glen]

Author: glen                         Date: Tue Feb 21 14:17:05 2006 GMT
Module: SOURCES                       Tag: DEVEL
---- Log message:
- update to 5.1.6-alpha

---- Files affected:
SOURCES:
   mysql-libs.patch (1.11 -> 1.11.2.1) , mysql-c++.patch (1.9 -> 1.9.2.1) , mysql-client-config.patch (1.2 -> 1.2.2.1) 

---- Diffs:

================================================================
Index: SOURCES/mysql-libs.patch
diff -u SOURCES/mysql-libs.patch:1.11 SOURCES/mysql-libs.patch:1.11.2.1
--- SOURCES/mysql-libs.patch:1.11	Wed Nov 23 09:26:53 2005
+++ SOURCES/mysql-libs.patch	Tue Feb 21 15:17:00 2006
@@ -28,15 +28,14 @@
  
  # For sem_xxx functions on Solaris 2.6
  AC_CHECK_FUNC(sem_init, , AC_CHECK_LIB(posix4, sem_init))
-diff -urN mysql-4.1.7.org/libmysql_r/Makefile.am mysql-4.1.7/libmysql_r/Makefile.am
---- mysql-4.1.7.org/libmysql_r/Makefile.am	2004-10-27 01:35:55.265121136 +0200
-+++ mysql-4.1.7/libmysql_r/Makefile.am	2004-10-27 01:36:23.574817408 +0200
-@@ -33,7 +33,7 @@
+--- mysql-5.1.6-alpha/libmysql_r/Makefile.am~	2006-02-21 15:58:18.000000000 +0200
++++ mysql-5.1.6-alpha/libmysql_r/Makefile.am	2006-02-21 15:59:01.000000000 +0200
+@@ -32,7 +32,7 @@
  libmysql_dir = $(top_srcdir)/libmysql
  
  libmysqlclient_r_la_SOURCES = $(target_sources)
--libmysqlclient_r_la_LIBADD = $(target_libadd)
-+libmysqlclient_r_la_LIBADD = $(target_libadd) -lpthread
+-libmysqlclient_r_la_LIBADD = $(target_libadd) $(yassl_libs_with_path)
++libmysqlclient_r_la_LIBADD = $(target_libadd) $(yassl_libs_with_path) -lpthread
  libmysqlclient_r_la_LDFLAGS = $(target_ldflags)
  
  # This is called from the toplevel makefile

================================================================
Index: SOURCES/mysql-c++.patch
diff -u SOURCES/mysql-c++.patch:1.9 SOURCES/mysql-c++.patch:1.9.2.1
--- SOURCES/mysql-c++.patch:1.9	Mon Oct 24 19:24:08 2005
+++ SOURCES/mysql-c++.patch	Tue Feb 21 15:17:00 2006
@@ -1,6 +1,5 @@
-diff -ur mysql-4.1.7.org/myisam/Makefile.am mysql-4.1.7/myisam/Makefile.am
---- mysql-4.1.7.org/myisam/Makefile.am	2004-10-27 01:35:55.000000000 +0200
-+++ mysql-4.1.7/myisam/Makefile.am	2004-10-27 01:41:47.764533080 +0200
+--- mysql-5.1.6-alpha/storage/myisam/Makefile.am~	2006-02-21 16:08:48.000000000 +0200
++++ mysql-5.1.6-alpha/storage/myisam/Makefile.am	2006-02-21 16:08:51.000000000 +0200
 @@ -21,7 +21,7 @@
  LDADD =			@CLIENT_EXTRA_LDFLAGS@ libmyisam.a \
  			$(top_builddir)/mysys/libmysys.a \

================================================================
Index: SOURCES/mysql-client-config.patch
diff -u SOURCES/mysql-client-config.patch:1.2 SOURCES/mysql-client-config.patch:1.2.2.1
--- SOURCES/mysql-client-config.patch:1.2	Mon Oct 24 19:24:08 2005
+++ SOURCES/mysql-client-config.patch	Tue Feb 21 15:17:00 2006
@@ -1,33 +1,30 @@
-diff -urbB mysql-5.0.13-rc.org/libmysqld/client.c mysql-5.0.13-rc/libmysqld/client.c
---- mysql-5.0.13-rc.org/libmysqld/client.c	2005-09-22 21:40:24.000000000 +0200
-+++ mysql-5.0.13-rc/libmysqld/client.c	2005-09-29 19:35:27.947950000 +0200
-@@ -1455,6 +1455,7 @@
+--- mysql-5.1.6-alpha/libmysqld/client.c~	2006-02-21 16:09:31.000000000 +0200
++++ mysql-5.1.6-alpha/libmysqld/client.c	2006-02-21 16:11:30.000000000 +0200
+@@ -1456,6 +1456,7 @@
  
    mysql->options.methods_to_use= MYSQL_OPT_GUESS_CONNECTION;
    mysql->options.report_data_truncation= TRUE;  /* default */
 +  mysql_read_default_options(&mysql->options, "/etc/mysql/mysql-client.conf", NULL);
-   return mysql;
- }
  
-diff -urbB mysql-5.0.13-rc.org/sql/client.c mysql-5.0.13-rc/sql/client.c
---- mysql-5.0.13-rc.org/sql/client.c	2005-09-22 21:40:24.000000000 +0200
-+++ mysql-5.0.13-rc/sql/client.c	2005-09-29 19:35:38.164588500 +0200
-@@ -1455,6 +1455,7 @@
+   /*
+     By default we don't reconnect because it could silently corrupt data (after
+--- mysql-5.1.6-alpha/sql/client.c~	2006-02-21 16:09:32.000000000 +0200
++++ mysql-5.1.6-alpha/sql/client.c	2006-02-21 16:12:13.000000000 +0200
+@@ -1456,6 +1456,7 @@
  
    mysql->options.methods_to_use= MYSQL_OPT_GUESS_CONNECTION;
    mysql->options.report_data_truncation= TRUE;  /* default */
 +  mysql_read_default_options(&mysql->options, "/etc/mysql/mysql-client.conf", NULL);
-   return mysql;
- }
  
-diff -urbB mysql-5.0.13-rc.org/sql-common/client.c mysql-5.0.13-rc/sql-common/client.c
---- mysql-5.0.13-rc.org/sql-common/client.c	2005-09-22 21:40:24.000000000 +0200
-+++ mysql-5.0.13-rc/sql-common/client.c	2005-09-29 19:35:54.881633250 +0200
-@@ -1455,6 +1455,7 @@
+   /*
+     By default we don't reconnect because it could silently corrupt data (after
+--- mysql-5.1.6-alpha/sql-common/client.c~	2006-02-21 16:09:34.000000000 +0200
++++ mysql-5.1.6-alpha/sql-common/client.c	2006-02-21 16:14:10.000000000 +0200
+@@ -1456,6 +1456,7 @@
  
    mysql->options.methods_to_use= MYSQL_OPT_GUESS_CONNECTION;
    mysql->options.report_data_truncation= TRUE;  /* default */
 +  mysql_read_default_options(&mysql->options, "/etc/mysql/mysql-client.conf", NULL);
-   return mysql;
- }
  
+   /*
+     By default we don't reconnect because it could silently corrupt data (after
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/mysql-libs.patch?r1=1.11&r2=1.11.2.1&f=u
    http://cvs.pld-linux.org/SOURCES/mysql-c++.patch?r1=1.9&r2=1.9.2.1&f=u
    http://cvs.pld-linux.org/SOURCES/mysql-client-config.patch?r1=1.2&r2=1.2.2.1&f=u