diff options
| author | unknown <jimw@mysql.com> | 2005-09-12 17:00:50 -0700 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-09-12 17:00:50 -0700 |
| commit | 8dc5c95b144e421475bf70d985a37b0ebd4d6180 (patch) | |
| tree | 1ad89ca3921996790f4f78584fb66bf871991e26 /sql-common | |
| parent | 74aeffda533697d88f19dabc86ffd8fcc19a8f7f (diff) | |
| parent | accf5c264a4e42fb966473453aa80b1f28d87946 (diff) | |
| download | mariadb-git-8dc5c95b144e421475bf70d985a37b0ebd4d6180.tar.gz | |
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
into mysql.com:/home/jimw/my/mysql-5.0-clean
include/my_global.h:
Auto merged
include/my_pthread.h:
Auto merged
include/violite.h:
Auto merged
mysql-test/r/ndb_autodiscover.result:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
ndb/src/ndbapi/SignalSender.cpp:
Auto merged
sql-common/client.c:
Auto merged
sql/examples/ha_archive.cc:
Auto merged
sql/net_serv.cc:
Auto merged
vio/vio.c:
Auto merged
vio/viosocket.c:
Auto merged
vio/viossl.c:
Auto merged
configure.in:
Resolve conflicts
Diffstat (limited to 'sql-common')
| -rw-r--r-- | sql-common/client.c | 2 |
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); |