Commit a6274848 authored by serg@serg.mysql.com's avatar serg@serg.mysql.com
Browse files

Merge work:/home/bk/mysql-4.0 

into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
parents 0785269e 165d2525

libmysql/libmysql.c

+1 −1
Original line number Diff line number Diff line
@@ -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 */