localize vars

[packages/mysql.git] / mysql-client-config.patch

diff --git a/mysql-client-config.patch b/mysql-client-config.patch
index 3f191fcf23bbbf682eabe6972a9d9c29ee25a3e6..5f56e98e738d4c218a57876f98c88f180d3a160c 100644 (file)
--- a/mysql-client-config.patch
+++ b/mysql-client-config.patch
@@ -1,42 +1,10 @@
-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
+--- 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;
- }
- 
-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
- 
-   mysql->options.methods_to_use= MYSQL_OPT_GUESS_CONNECTION;
-+
-+  
-+  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
- 
-   mysql->options.methods_to_use= MYSQL_OPT_GUESS_CONNECTION;
-+
-+  
-+  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