]>
Commit | Line | Data |
---|---|---|
66b652cf AM |
1 | diff -urN mysql-4.1.12.org/libmysqld/client.c mysql-4.1.12/libmysqld/client.c |
2 | --- mysql-4.1.12.org/libmysqld/client.c 2005-05-13 13:32:04.000000000 +0200 | |
3 | +++ mysql-4.1.12/libmysqld/client.c 2005-07-09 16:20:39.539684568 +0200 | |
4 | @@ -1447,6 +1447,10 @@ | |
5 | #endif | |
6 | ||
7 | mysql->options.methods_to_use= MYSQL_OPT_GUESS_CONNECTION; | |
8 | + | |
9 | + | |
10 | + mysql_read_default_options(&mysql->options, "/etc/mysql/mysql-client.conf", NULL); | |
11 | + | |
12 | return mysql; | |
13 | } | |
14 | ||
15 | diff -urN mysql-4.1.12.org/sql/client.c mysql-4.1.12/sql/client.c | |
16 | --- mysql-4.1.12.org/sql/client.c 2005-05-13 13:32:04.000000000 +0200 | |
17 | +++ mysql-4.1.12/sql/client.c 2005-07-09 16:20:44.317958160 +0200 | |
18 | @@ -1447,6 +1447,10 @@ | |
19 | #endif | |
20 | ||
21 | mysql->options.methods_to_use= MYSQL_OPT_GUESS_CONNECTION; | |
22 | + | |
23 | + | |
24 | + mysql_read_default_options(&mysql->options, "/etc/mysql/mysql-client.conf", NULL); | |
25 | + | |
26 | return mysql; | |
27 | } | |
28 | ||
29 | diff -urN mysql-4.1.12.org/sql-common/client.c mysql-4.1.12/sql-common/client.c | |
30 | --- mysql-4.1.12.org/sql-common/client.c 2005-05-13 13:32:04.000000000 +0200 | |
31 | +++ mysql-4.1.12/sql-common/client.c 2005-07-09 16:20:48.267357760 +0200 | |
32 | @@ -1447,6 +1447,10 @@ | |
33 | #endif | |
34 | ||
35 | mysql->options.methods_to_use= MYSQL_OPT_GUESS_CONNECTION; | |
36 | + | |
37 | + | |
38 | + mysql_read_default_options(&mysql->options, "/etc/mysql/mysql-client.conf", NULL); | |
39 | + | |
40 | return mysql; | |
41 | } | |
42 |