SOURCES: mysql-c++.patch, mysql-client-config.patch - merge from D...

[arekm]

Author: arekm                        Date: Mon Oct 24 17:24:13 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- merge from DEVEL

---- Files affected:
SOURCES:
   mysql-c++.patch (1.8 -> 1.9) , mysql-client-config.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/mysql-c++.patch
diff -u SOURCES/mysql-c++.patch:1.8 SOURCES/mysql-c++.patch:1.9
--- SOURCES/mysql-c++.patch:1.8	Tue Mar 29 23:24:45 2005
+++ SOURCES/mysql-c++.patch	Mon Oct 24 19:24:08 2005
@@ -1,16 +1,3 @@
-diff -ur mysql-4.1.7.org/isam/Makefile.am mysql-4.1.7/isam/Makefile.am
---- mysql-4.1.7.org/isam/Makefile.am	2004-10-27 01:35:55.374104568 +0200
-+++ mysql-4.1.7/isam/Makefile.am	2004-10-27 01:41:21.199571568 +0200
-@@ -16,7 +16,7 @@
- 
- INCLUDES =		@MT_INCLUDES@ -I$(top_srcdir)/include 
- LDADD =			@CLIENT_EXTRA_LDFLAGS@ libnisam.a ../mysys/libmysys.a \
--			../dbug/libdbug.a ../strings/libmystrings.a
-+			../dbug/libdbug.a ../strings/libmystrings.a $(libdir)/libsupc++.la
- pkglib_LIBRARIES =	libnisam.a
- bin_PROGRAMS =		isamchk isamlog pack_isam
- isamchk_DEPENDENCIES=	$(LIBRARIES)
-Tylko w mysql-4.1.7/isam: Makefile.am.orig
 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

================================================================
Index: SOURCES/mysql-client-config.patch
diff -u SOURCES/mysql-client-config.patch:1.1 SOURCES/mysql-client-config.patch:1.2
--- SOURCES/mysql-client-config.patch:1.1	Sat Jul  9 18:24:01 2005
+++ SOURCES/mysql-client-config.patch	Mon Oct 24 19:24:08 2005
@@ -1,42 +1,33 @@
-diff -urN mysql-4.1.12.org/libmysqld/client.c mysql-4.1.12/libmysqld/client.c
---- mysql-4.1.12.org/libmysqld/client.c	2005-05-13 13:32:04.000000000 +0200
-+++ mysql-4.1.12/libmysqld/client.c	2005-07-09 16:20:39.539684568 +0200
-@@ -1447,6 +1447,10 @@
- #endif
+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->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 -urN mysql-4.1.12.org/sql/client.c mysql-4.1.12/sql/client.c
---- mysql-4.1.12.org/sql/client.c	2005-05-13 13:32:04.000000000 +0200
-+++ mysql-4.1.12/sql/client.c	2005-07-09 16:20:44.317958160 +0200
-@@ -1447,6 +1447,10 @@
- #endif
+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 @@
  
    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 -urN mysql-4.1.12.org/sql-common/client.c mysql-4.1.12/sql-common/client.c
---- mysql-4.1.12.org/sql-common/client.c	2005-05-13 13:32:04.000000000 +0200
-+++ mysql-4.1.12/sql-common/client.c	2005-07-09 16:20:48.267357760 +0200
-@@ -1447,6 +1447,10 @@
- #endif
+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 @@
  
    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;
  }
  
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/mysql-c++.patch?r1=1.8&r2=1.9&f=u
    http://cvs.pld-linux.org/SOURCES/mysql-client-config.patch?r1=1.1&r2=1.2&f=u