[packages/percona-server/v5.1.x: 3/21] This commit was manufactured by cvs2git to create branch 'unlabeled-1.1.2'.

[glen]

commit be0099054779c8985aab2526b3c856775d05b160
Author: cvs2git <feedback at pld-linux.org>
Date:   Sat Jul 9 16:24:01 2005 +0000

    This commit was manufactured by cvs2git to create branch 'unlabeled-1.1.2'.
    
    Cherrypick from master 2005-07-09 16:24:01 UTC Arkadiusz Miśkiewicz <arekm at maven.pl> '- process mysql-client.conf file':
        mysql-client-config.patch -> 1.1

 mysql-client-config.patch | 42 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)
---
diff --git a/mysql-client-config.patch b/mysql-client-config.patch
new file mode 100644
index 0000000..3f191fc
--- /dev/null
+++ b/mysql-client-config.patch
@@ -0,0 +1,42 @@
+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;
+ }
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/percona-server.git/commitdiff/bf636d07b36bfd2921b9ecf2033c78270355c98c