diff options
| author | unknown <serg@serg.mysql.com> | 2001-10-25 13:09:04 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mysql.com> | 2001-10-25 13:09:04 +0200 |
| commit | 73c7c2adba6733272e631571bf3b88c796a41e2b (patch) | |
| tree | 5023dec4d5780ae20c316eaa1a0624f4a7f1553e /libmysql | |
| parent | 53a6a37313cb12261c32207fb2f4d9ead1661128 (diff) | |
| parent | d1eeab3fb963bf27e51c8fd2bc08a8bfafbb96df (diff) | |
| download | mariadb-git-73c7c2adba6733272e631571bf3b88c796a41e2b.tar.gz | |
Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
libmysql/libmysql.c:
Auto 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 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 */ |