diff options
author | cmiller@zippy.cornsilk.net <> | 2006-09-05 16:46:55 -0400 |
---|---|---|
committer | cmiller@zippy.cornsilk.net <> | 2006-09-05 16:46:55 -0400 |
commit | 7ca1a49437756a9a3eafaff049b398e8c9f1a490 (patch) | |
tree | 6a8ae78c604f958c767ebba4f559c2e8a4315b93 /sql/net_serv.cc | |
parent | 954256c324e50e47929c94eaf72667ba69200a69 (diff) | |
parent | c746c08af9287e43b8517307e32be258e0c6f1f1 (diff) | |
download | mariadb-git-7ca1a49437756a9a3eafaff049b398e8c9f1a490.tar.gz |
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
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 a44e07bbb86..a55fef5555c 100644 --- a/sql/net_serv.cc +++ b/sql/net_serv.cc @@ -859,7 +859,7 @@ my_real_read(NET *net, ulong *complen) #endif /* EXTRA_DEBUG */ } #if defined(THREAD_SAFE_CLIENT) && !defined(MYSQL_SERVER) - if (vio_should_retry(net->vio)) + if (vio_errno(net->vio) == SOCKET_EINTR) { DBUG_PRINT("warning",("Interrupted read. Retrying...")); continue; |