Commit 478d4021 authored by unknown's avatar unknown
Browse files

Fix for bug#2021: Wron error message from the client 


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
parent cf2ecf37

BitKeeper/etc/logging_ok

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

libmysql/libmysql.c

+2 −4
Original line number Diff line number Diff line
@@ -438,12 +438,8 @@ 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)

  {

    strmov(net->last_error,ER(mysql->net.last_errno=CR_COMMANDS_OUT_OF_SYNC));
@@ -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);