Skip to content

M
mariadb
Commit 680db632 authored by hf@deer.(none)'s avatar hf@deer.(none)
Browse files
Options

Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 

into deer.(none):/home/hf/work/mysql-4.1.clean
parents 7336f9cd 33603d79
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
sql-common/client.c
View file @ 680db632
...@@ -547,6 +547,10 @@ net_safe_read(MYSQL *mysql) ...@@ -547,6 +547,10 @@ net_safe_read(MYSQL *mysql)
{ {
DBUG_PRINT("error",("Wrong connection or packet. fd: %s len: %d", DBUG_PRINT("error",("Wrong connection or packet. fd: %s len: %d",
vio_description(net->vio),len)); vio_description(net->vio),len));
#ifdef MYSQL_SERVER
if (socket_errno == SOCKET_EINTR)
return (packet_error);
#endif /*MYSQL_SERVER*/
end_server(mysql); end_server(mysql);
net->last_errno=(net->last_errno == ER_NET_PACKET_TOO_LARGE ? net->last_errno=(net->last_errno == ER_NET_PACKET_TOO_LARGE ?
CR_NET_PACKET_TOO_LARGE: CR_NET_PACKET_TOO_LARGE:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7