diff options
| author | unknown <holyfoot/hf@hfmain.(none)> | 2007-06-29 10:51:42 +0500 |
|---|---|---|
| committer | unknown <holyfoot/hf@hfmain.(none)> | 2007-06-29 10:51:42 +0500 |
| commit | b70c486e9656d8e6ad8c60ca6d715ac798a9cc55 (patch) | |
| tree | 64795d9799b6932ea46b06c358cbb1930c019dd9 /sql-common/client.c | |
| parent | 26bed2a607c47e8b382064bc9acbb1198a1da62f (diff) | |
| parent | 3e7f28edbc8d9acdb596be9a30ee577aba62208f (diff) | |
| download | mariadb-git-b70c486e9656d8e6ad8c60ca6d715ac798a9cc55.tar.gz | |
Merge bk@192.168.21.1:mysql-5.1-opt
into mysql.com:/home/hf/work/29247/my51-29247
sql-common/client.c:
Auto merged
sql/handler.h:
Auto merged
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 f6325d923ab..6d63c457390 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -2459,6 +2459,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, |