diff options
| author | holyfoot/hf@hfmain.(none) <> | 2007-06-29 10:48:12 +0500 |
|---|---|---|
| committer | holyfoot/hf@hfmain.(none) <> | 2007-06-29 10:48:12 +0500 |
| commit | 2834a07bcd9603417d9580298a511ebec35da15f (patch) | |
| tree | b9e23665df5ad3427dc2e0dd035d4f85d4c273fc /sql-common/client.c | |
| parent | 38991f3e803c552f014eda86a974587bceea03c0 (diff) | |
| parent | 43e0e17ae637ac5984905f7433d38bfe0cf7e9bc (diff) | |
| download | mariadb-git-2834a07bcd9603417d9580298a511ebec35da15f.tar.gz | |
Merge mysql.com:/home/hf/work/29247/my50-29247
into mysql.com:/home/hf/work/29247/my51-29247
Diffstat (limited to 'sql-common/client.c')
| -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, |