]>
Commit | Line | Data |
---|---|---|
13ce82d8 | 1 | --- mysql-5.1.6-alpha/libmysqld/client.c~ 2006-02-21 16:09:31.000000000 +0200 |
2 | +++ mysql-5.1.6-alpha/libmysqld/client.c 2006-02-21 16:11:30.000000000 +0200 | |
3 | @@ -1456,6 +1456,7 @@ | |
4 | ||
5 | mysql->options.methods_to_use= MYSQL_OPT_GUESS_CONNECTION; | |
6 | mysql->options.report_data_truncation= TRUE; /* default */ | |
7 | + mysql_read_default_options(&mysql->options, "/etc/mysql/mysql-client.conf", NULL); | |
8 | ||
9 | /* | |
10 | By default we don't reconnect because it could silently corrupt data (after | |
11 | --- mysql-5.1.6-alpha/sql/client.c~ 2006-02-21 16:09:32.000000000 +0200 | |
12 | +++ mysql-5.1.6-alpha/sql/client.c 2006-02-21 16:12:13.000000000 +0200 | |
13 | @@ -1456,6 +1456,7 @@ | |
14 | ||
15 | mysql->options.methods_to_use= MYSQL_OPT_GUESS_CONNECTION; | |
16 | mysql->options.report_data_truncation= TRUE; /* default */ | |
17 | + mysql_read_default_options(&mysql->options, "/etc/mysql/mysql-client.conf", NULL); | |
18 | ||
19 | /* | |
20 | By default we don't reconnect because it could silently corrupt data (after | |
21 | --- mysql-5.1.6-alpha/sql-common/client.c~ 2006-02-21 16:09:34.000000000 +0200 | |
22 | +++ mysql-5.1.6-alpha/sql-common/client.c 2006-02-21 16:14:10.000000000 +0200 | |
23 | @@ -1456,6 +1456,7 @@ | |
24 | ||
25 | mysql->options.methods_to_use= MYSQL_OPT_GUESS_CONNECTION; | |
26 | mysql->options.report_data_truncation= TRUE; /* default */ | |
27 | + mysql_read_default_options(&mysql->options, "/etc/mysql/mysql-client.conf", NULL); | |
28 | ||
29 | /* | |
30 | By default we don't reconnect because it could silently corrupt data (after |