- merge from DEVEL; cut down changelog

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

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->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/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;
 }