mirror of
https://github.com/MariaDB/server.git
synced 2026-05-01 20:55:32 +02:00
Merge mysql.com:/home/hf/work/29247/my50-29247
into mysql.com:/home/hf/work/29247/my51-29247 sql-common/client.c: Auto merged
This commit is contained in:
commit
09e78f80f5
1 changed files with 1 additions and 0 deletions
|
|
@ -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,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue