diff options
| author | unknown <SergeyV@selena.> | 2005-09-06 19:46:11 +0400 |
|---|---|---|
| committer | unknown <SergeyV@selena.> | 2005-09-06 19:46:11 +0400 |
| commit | 39fe0e81a0d7c41d239575fc779c4ac9ea569c1b (patch) | |
| tree | 1343c06c1330932432e83d8a699bb2c105013066 /sql | |
| parent | f1941de5e3c62a2dae8fb40dd97d3cf352ac9293 (diff) | |
| parent | a8a5e98ec6a1170173d897b0da0d39866c79c7ba (diff) | |
| download | mariadb-git-39fe0e81a0d7c41d239575fc779c4ac9ea569c1b.tar.gz | |
Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-4.0
into selena.:H:/MYSQL/src/#05588-mysql-4.0
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/mini_client.cc | 2 | ||||
| -rw-r--r-- | sql/net_serv.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sql/mini_client.cc b/sql/mini_client.cc index 86d50dc9a0e..cd00db5c7df 100644 --- a/sql/mini_client.cc +++ b/sql/mini_client.cc @@ -399,7 +399,7 @@ mc_net_safe_read(MYSQL *mysql) { DBUG_PRINT("error",("Wrong connection or packet. fd: %s len: %d", vio_description(net->vio),len)); - if (socket_errno != SOCKET_EINTR) + if (!vio_was_interrupted(net->vio)) { mc_end_server(mysql); if (net->last_errno != ER_NET_PACKET_TOO_LARGE) diff --git a/sql/net_serv.cc b/sql/net_serv.cc index c527ee1eb76..1e66bfc3e19 100644 --- a/sql/net_serv.cc +++ b/sql/net_serv.cc @@ -700,7 +700,7 @@ my_real_read(NET *net, ulong *complen) len= packet_error; net->error=2; /* Close socket */ #ifdef MYSQL_SERVER - net->last_errno= (interrupted ? ER_NET_READ_INTERRUPTED : + net->last_errno= (vio_was_interrupted(net->vio) ? ER_NET_READ_INTERRUPTED : ER_NET_READ_ERROR); #endif goto end; |