diff options
| author | unknown <SergeyV@selena.> | 2005-09-07 14:59:41 +0400 |
|---|---|---|
| committer | unknown <SergeyV@selena.> | 2005-09-07 14:59:41 +0400 |
| commit | 3f9348ac38aecbcbc07375061a3808385bc2b443 (patch) | |
| tree | 6d7d7c48dfa20e970a334d389572e8177394c300 /sql/net_serv.cc | |
| parent | fa33ea695195655b94d14a36d1951410d8a250c9 (diff) | |
| parent | 29ffd9e12cb2a92cffad43f137ca3ff2c8bf2dc8 (diff) | |
| download | mariadb-git-3f9348ac38aecbcbc07375061a3808385bc2b443.tar.gz | |
Merge selena.:H:/MYSQL/src/#05588-mysql-4.0
into selena.:H:/MYSQL/src/#05588-mysql-4.1
BitKeeper/deleted/.del-lib_vio.c~d779731a1e391220:
Auto merged
BitKeeper/deleted/.del-mini_client.cc~8677895ec8169183:
Auto merged
include/violite.h:
Auto merged
sql/net_serv.cc:
Auto merged
vio/vio.c:
Auto merged
vio/viosocket.c:
Auto merged
include/my_global.h:
SCCS merged
Diffstat (limited to 'sql/net_serv.cc')
| -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; |