diff options
| author | unknown <SergeyV@selena.> | 2005-09-12 22:19:04 +0400 |
|---|---|---|
| committer | unknown <SergeyV@selena.> | 2005-09-12 22:19:04 +0400 |
| commit | c231cb6a04327fdd79165064ab28eae00c19d955 (patch) | |
| tree | dd9dd84d853b90e97204cd39b37a66c11499c2ae /sql | |
| parent | 7254e748fe72705b9d2034184040d0c286c5875b (diff) | |
| parent | 22b3e6f8823f78e40363d48ae44b7a57d06d2554 (diff) | |
| download | mariadb-git-c231cb6a04327fdd79165064ab28eae00c19d955.tar.gz | |
Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-4.1
into selena.:H:/MYSQL/src/#05588-mysql-4.1
include/my_global.h:
Auto merged
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/net_serv.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/net_serv.cc b/sql/net_serv.cc index 9d84d0b2427..93fa7ac938c 100644 --- a/sql/net_serv.cc +++ b/sql/net_serv.cc @@ -759,7 +759,7 @@ my_real_read(NET *net, ulong *complen) net->error= 2; /* Close socket */ net->report_error= 1; #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; |