diff options
| author | unknown <SergeyV@selena.> | 2005-09-07 15:57:14 +0400 |
|---|---|---|
| committer | unknown <SergeyV@selena.> | 2005-09-07 15:57:14 +0400 |
| commit | 22b3e6f8823f78e40363d48ae44b7a57d06d2554 (patch) | |
| tree | bcf60553d2cda3c381a8cd81327d8f8cbfd032f9 /sql-common | |
| parent | c9b589defa19cc955537213337d941c082607813 (diff) | |
| download | mariadb-git-22b3e6f8823f78e40363d48ae44b7a57d06d2554.tar.gz | |
Fixes bug #5588. Additions after merge from 4.0.
sql-common/client.c:
Fixes bug #5588. checks if operation was timed out.
vio/vio.c:
Added vio_was_interrupted() function references to detect timed out
operation properly on win32.
vio/vio_priv.h:
Added vio_ssl_was_interrupted() function that detects timed out
operation properly on win32.
vio/viosocket.c:
Minor changes to follow up the coding standard.
vio/viossl.c:
Added vio_ssl_was_interrupted() function that detects timed out
operation properly on win32.
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 73e136f7366..3979b9304f7 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -602,7 +602,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); |