Commit 9aa49681 authored by monty@mashka.mysql.fi's avatar monty@mashka.mysql.fi
Browse files

Make PACKET_TOO_LARGE error handling safer in client

parent 2162408b

libmysql/libmysql.c

+9 −11
Original line number Diff line number Diff line
@@ -460,13 +460,12 @@ simple_command(MYSQL *mysql,enum enum_server_command command, const char *arg, 
    {

      net->last_errno=CR_NET_PACKET_TOO_LARGE;

      strmov(net->last_error,ER(net->last_errno));

      return(packet_error);

      goto end;

    }

    else

    {

    end_server(mysql);

      if (mysql_reconnect(mysql) ||

	  net_write_command(net,(uchar) command,arg,

    if (mysql_reconnect(mysql))

      goto end;

    if (net_write_command(net,(uchar) command,arg,

			  length ? length : (ulong) strlen(arg)))

    {

      net->last_errno= CR_SERVER_GONE_ERROR;
@@ -474,7 +473,6 @@ simple_command(MYSQL *mysql,enum enum_server_command command, const char *arg, 
      goto end;

    }

  }

  }

  result=0;

  if (!skipp_check)

    result= ((mysql->packet_length=net_safe_read(mysql)) == packet_error ?