diff options
| author | serg@serg.mysql.com <> | 2001-10-25 13:09:04 +0200 |
|---|---|---|
| committer | serg@serg.mysql.com <> | 2001-10-25 13:09:04 +0200 |
| commit | a6274848a23323acc070704b718d4c41eb88dda6 (patch) | |
| tree | 5023dec4d5780ae20c316eaa1a0624f4a7f1553e /libmysql/libmysql.c | |
| parent | 0785269e5fc72502e659ffa05334c76f148e8351 (diff) | |
| parent | 165d25254605303e8fd6557d0b785f6d19b52db8 (diff) | |
| download | mariadb-git-a6274848a23323acc070704b718d4c41eb88dda6.tar.gz | |
Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
Diffstat (limited to 'libmysql/libmysql.c')
| -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 28f643ab497..8f228f51ed7 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -1908,6 +1908,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, @@ -1915,7 +1916,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 */ |