diff options
author | unknown <serg@serg.mysql.com> | 2001-10-25 13:05:26 +0200 |
---|---|---|
committer | unknown <serg@serg.mysql.com> | 2001-10-25 13:05:26 +0200 |
commit | 38ffa5875c2d16ef66a1a4c5830ee228f47ab4f9 (patch) | |
tree | 493bb5eb00e5557ec6511de6183931b5f32fb91c /libmysql | |
parent | bf06377ba064e53ede0fa03996b3bb57329443e1 (diff) | |
parent | db8746e223c2bf58a5f8fcabc8809c55ed5045de (diff) | |
download | mariadb-git-38ffa5875c2d16ef66a1a4c5830ee228f47ab4f9.tar.gz |
Merge
libmysql/libmysql.c:
SCCS merged
Diffstat (limited to 'libmysql')
-rw-r--r-- | libmysql/libmysql.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index 2255dcb83bd..edee12740ca 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -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 */ |