mirror of
https://github.com/MariaDB/server.git
synced 2025-07-27 18:02:13 +03:00
Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
This commit is contained in:
@ -1908,6 +1908,7 @@ static my_bool mysql_reconnect(MYSQL *mysql)
|
|||||||
}
|
}
|
||||||
mysql_init(&tmp_mysql);
|
mysql_init(&tmp_mysql);
|
||||||
tmp_mysql.options=mysql->options;
|
tmp_mysql.options=mysql->options;
|
||||||
|
bzero((char*) &mysql->options,sizeof(mysql->options));
|
||||||
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,
|
||||||
mysql->db, mysql->port, mysql->unix_socket,
|
mysql->db, mysql->port, mysql->unix_socket,
|
||||||
@ -1915,7 +1916,6 @@ static my_bool mysql_reconnect(MYSQL *mysql)
|
|||||||
DBUG_RETURN(1);
|
DBUG_RETURN(1);
|
||||||
tmp_mysql.free_me=mysql->free_me;
|
tmp_mysql.free_me=mysql->free_me;
|
||||||
mysql->free_me=0;
|
mysql->free_me=0;
|
||||||
bzero((char*) &mysql->options,sizeof(mysql->options));
|
|
||||||
mysql_close(mysql);
|
mysql_close(mysql);
|
||||||
*mysql=tmp_mysql;
|
*mysql=tmp_mysql;
|
||||||
mysql_fix_pointers(mysql, &tmp_mysql); /* adjust connection pointers */
|
mysql_fix_pointers(mysql, &tmp_mysql); /* adjust connection pointers */
|
||||||
|
Reference in New Issue
Block a user