diff options
| author | gluh@gluh.mysql.r18.ru <> | 2004-02-11 12:30:50 +0400 |
|---|---|---|
| committer | gluh@gluh.mysql.r18.ru <> | 2004-02-11 12:30:50 +0400 |
| commit | 3dba2e8cb0a46b4ca64892968562166a5d93b20d (patch) | |
| tree | 016e3fa7e79a4a734540beed459286f83eb43d6c | |
| parent | 2093624a732c5bec57db3460d2297356e07c4946 (diff) | |
| parent | d5fa169fd1edc2bf9adfbb1e7acb1b163f27e693 (diff) | |
| download | mariadb-git-3dba2e8cb0a46b4ca64892968562166a5d93b20d.tar.gz | |
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-3.23
into gluh.mysql.r18.ru:/home/gluh/Bugs/mysql-3.23.bug
| -rw-r--r-- | BitKeeper/etc/logging_ok | 1 | ||||
| -rw-r--r-- | libmysql/libmysql.c | 6 |
2 files changed, 3 insertions, 4 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index 11a8f3b8fcd..359cad878c2 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -5,6 +5,7 @@ bar@bar.mysql.r18.ru bar@bar.udmsearch.izhnet.ru bell@sanja.is.com.ua bk@admin.bk +gluh@gluh.mysql.r18.ru greg@gcw.ath.cx greg@mysql.com guilhem@mysql.com diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index c50193c5e2c..eff8c87ee3f 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -438,11 +438,7 @@ simple_command(MYSQL *mysql,enum enum_server_command command, const char *arg, if (mysql->net.vio == 0) { /* Do reconnect if possible */ if (mysql_reconnect(mysql)) - { - net->last_errno=CR_SERVER_GONE_ERROR; - strmov(net->last_error,ER(net->last_errno)); goto end; - } } if (mysql->status != MYSQL_STATUS_READY) { @@ -1610,6 +1606,8 @@ static my_bool mysql_reconnect(MYSQL *mysql) { /* Allov reconnect next time */ mysql->server_status&= ~SERVER_STATUS_IN_TRANS; + mysql->net.last_errno= CR_SERVER_GONE_ERROR; + strmov(mysql->net.last_error, ER(mysql->net.last_errno)); DBUG_RETURN(1); } mysql_init(&tmp_mysql); |