Merge bk@192.168.21.1:mysql-5.0-opt

into  mysql.com:/home/hf/work/29247/my50-29247
This commit is contained in:
holyfoot/hf@hfmain.(none) 2007-06-29 10:50:56 +05:00
commit 2fafcb1e53

View File

@ -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,