diff options
| author | kroki/tomash@moonlight.intranet <> | 2006-08-14 20:01:19 +0400 |
|---|---|---|
| committer | kroki/tomash@moonlight.intranet <> | 2006-08-14 20:01:19 +0400 |
| commit | c746c08af9287e43b8517307e32be258e0c6f1f1 (patch) | |
| tree | 06565f2fc9492fafb30c77e4dd7613366eaab02c /sql/net_serv.cc | |
| parent | 01f5bc3a8336706f822457d95d448f034e5143f5 (diff) | |
| download | mariadb-git-c746c08af9287e43b8517307e32be258e0c6f1f1.tar.gz | |
BUG#9678: Client library hangs after network communication failure
Socket timeouts in client library were used only on Windows.
The solution is to use socket timeouts in client library on all
systems were they are supported.
No test case is provided because it is impossible to simulate network
failure in current test suit.
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 93fa7ac938c..08184537896 100644 --- a/sql/net_serv.cc +++ b/sql/net_serv.cc @@ -747,7 +747,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; |