diff options
| author | unknown <jimw@mysql.com> | 2005-09-12 12:47:45 -0700 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-09-12 12:47:45 -0700 |
| commit | 06c2d66e8d793ab7f588b239c53bd47875834a26 (patch) | |
| tree | 15300258798c667e50504fae2335793e28254606 /sql | |
| parent | 38b2cd733b4884d961d2186c052a0f3bcb1bb41b (diff) | |
| parent | 333bc203d2e7a4aafad924a16541470d9d11ec72 (diff) | |
| download | mariadb-git-06c2d66e8d793ab7f588b239c53bd47875834a26.tar.gz | |
Merge bk-internal:/home/bk/mysql-4.1
into mysql.com:/home/jimw/my/mysql-4.1-clean
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; |