database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Make PACKET_TOO_LARGE error handling safer in client

Browse Source
This commit is contained in:
monty@mashka.mysql.fi
2003-01-28 02:10:56 +02:00
parent 2162408b26
commit 9aa49681b8
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libmysql/libmysql.c
View File

@ -460,13 +460,12 @@ simple_command(MYSQL *mysql,enum enum_server_command command, const char *arg,
{ {
net->last_errno=CR_NET_PACKET_TOO_LARGE; net->last_errno=CR_NET_PACKET_TOO_LARGE;
strmov(net->last_error,ER(net->last_errno)); strmov(net->last_error,ER(net->last_errno));
return(packet_error); goto end;
} }
else
{
end_server(mysql); end_server(mysql);
if (mysql_reconnect(mysql) || if (mysql_reconnect(mysql))
net_write_command(net,(uchar) command,arg, goto end;
if (net_write_command(net,(uchar) command,arg,
length ? length : (ulong) strlen(arg))) length ? length : (ulong) strlen(arg)))
{ {
net->last_errno= CR_SERVER_GONE_ERROR; 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; goto end;
} }
} }
}
result=0; result=0;
if (!skipp_check) if (!skipp_check)
result= ((mysql->packet_length=net_safe_read(mysql)) == packet_error ? result= ((mysql->packet_length=net_safe_read(mysql)) == packet_error ?