mirror of
https://github.com/MariaDB/server.git
synced 2025-06-13 13:01:51 +03:00
Merge
libmysql/libmysql.c: SCCS merged
This commit is contained in:
@ -1900,6 +1900,7 @@ static my_bool mysql_reconnect(MYSQL *mysql)
|
||||
}
|
||||
mysql_init(&tmp_mysql);
|
||||
tmp_mysql.options=mysql->options;
|
||||
bzero((char*) &mysql->options,sizeof(mysql->options));
|
||||
tmp_mysql.rpl_pivot = mysql->rpl_pivot;
|
||||
if (!mysql_real_connect(&tmp_mysql,mysql->host,mysql->user,mysql->passwd,
|
||||
mysql->db, mysql->port, mysql->unix_socket,
|
||||
@ -1907,7 +1908,6 @@ static my_bool mysql_reconnect(MYSQL *mysql)
|
||||
DBUG_RETURN(1);
|
||||
tmp_mysql.free_me=mysql->free_me;
|
||||
mysql->free_me=0;
|
||||
bzero((char*) &mysql->options,sizeof(mysql->options));
|
||||
mysql_close(mysql);
|
||||
*mysql=tmp_mysql;
|
||||
mysql_fix_pointers(mysql, &tmp_mysql); /* adjust connection pointers */
|
||||
|
Reference in New Issue
Block a user