diff options
| author | unknown <holyfoot/hf@hfmain.(none)> | 2007-06-29 10:48:12 +0500 |
|---|---|---|
| committer | unknown <holyfoot/hf@hfmain.(none)> | 2007-06-29 10:48:12 +0500 |
| commit | 09e78f80f5cc6df38bbfee9df2310b952b5ba5bb (patch) | |
| tree | b9e23665df5ad3427dc2e0dd035d4f85d4c273fc /sql-common | |
| parent | fdbefa8d528faf8e1d99d251c23c8a77f14b1aa2 (diff) | |
| parent | 57444944d57adc5bee1548e3c2d6bffd2f8d903d (diff) | |
| download | mariadb-git-09e78f80f5cc6df38bbfee9df2310b952b5ba5bb.tar.gz | |
Merge mysql.com:/home/hf/work/29247/my50-29247
into mysql.com:/home/hf/work/29247/my51-29247
sql-common/client.c:
Auto merged
Diffstat (limited to 'sql-common')
| -rw-r--r-- | sql-common/client.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql-common/client.c b/sql-common/client.c index 42d3be17798..0b01b050314 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -2451,6 +2451,7 @@ my_bool mysql_reconnect(MYSQL *mysql) } mysql_init(&tmp_mysql); tmp_mysql.options= mysql->options; + tmp_mysql.options.my_cnf_file= tmp_mysql.options.my_cnf_group= 0; tmp_mysql.rpl_pivot= mysql->rpl_pivot; if (!mysql_real_connect(&tmp_mysql,mysql->host,mysql->user,mysql->passwd, |