Skip to content

M
mariadb
Commit cb7efcad authored by holyfoot/hf@hfmain.(none)'s avatar holyfoot/hf@hfmain.(none)
Browse files
Options

Merge mysql.com:/home/hf/work/29252/my51-29252 

into  mysql.com:/home/hf/work/29247/my51-29247
parents 0a4b46be 2834a07b
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 0 deletions
sql-common/client.c
View file @ cb7efcad
...@@ -2451,6 +2451,7 @@ my_bool mysql_reconnect(MYSQL *mysql) ...@@ -2451,6 +2451,7 @@ my_bool mysql_reconnect(MYSQL *mysql)
} }
mysql_init(&tmp_mysql); mysql_init(&tmp_mysql);
tmp_mysql.options= mysql->options; 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; tmp_mysql.rpl_pivot= mysql->rpl_pivot;
if (!mysql_real_connect(&tmp_mysql,mysql->host,mysql->user,mysql->passwd, if (!mysql_real_connect(&tmp_mysql,mysql->host,mysql->user,mysql->passwd,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7