summaryrefslogtreecommitdiff
path: root/sql-common
diff options
context:
space:
mode:
authorjimw@mysql.com <>2005-09-12 17:00:50 -0700
committerjimw@mysql.com <>2005-09-12 17:00:50 -0700
commita60ed0b75d75304324c7d7ca70125a5d650033d9 (patch)
tree1ad89ca3921996790f4f78584fb66bf871991e26 /sql-common
parentb5dbd1c7a1807f6d0c98c131f933385d4f305b02 (diff)
parent0eec7c3cf4c36717c790cd779850e6e22303bdba (diff)
downloadmariadb-git-a60ed0b75d75304324c7d7ca70125a5d650033d9.tar.gz
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
into mysql.com:/home/jimw/my/mysql-5.0-clean
Diffstat (limited to 'sql-common')
-rw-r--r--sql-common/client.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql-common/client.c b/sql-common/client.c
index cc70bbc7523..43c50f12ae1 100644
--- a/sql-common/client.c
+++ b/sql-common/client.c
@@ -599,7 +599,7 @@ net_safe_read(MYSQL *mysql)
DBUG_PRINT("error",("Wrong connection or packet. fd: %s len: %d",
vio_description(net->vio),len));
#ifdef MYSQL_SERVER
- if (vio_errno(net->vio) == SOCKET_EINTR)
+ if (vio_was_interrupted(net->vio))
return (packet_error);
#endif /*MYSQL_SERVER*/
end_server(mysql);