diff options
| author | msvensson@pilot.blaudden <> | 2007-05-24 11:21:27 +0200 |
|---|---|---|
| committer | msvensson@pilot.blaudden <> | 2007-05-24 11:21:27 +0200 |
| commit | 93b1fe65d82661f29b1f6e1ad341eb0f68f4c93c (patch) | |
| tree | b344506ca47d428ac52b3ed42e0688a171e767a0 /sql/sql_repl.cc | |
| parent | 9abaacca9cc7b44c66c0289f483cc13d9f5b64ab (diff) | |
| download | mariadb-git-93b1fe65d82661f29b1f6e1ad341eb0f68f4c93c.tar.gz | |
Bug#26664 test suite times out on OS X 64bit
- The "mysql client in mysqld"(which is used by
replication and federated) should use alarms instead of setting
socket timeout value if the rest of the server uses alarm. By
always calling 'my_net_set_write_timeout'
or 'my_net_set_read_timeout' when changing the timeout value(s), the
selection whether to use alarms or timeouts will be handled by
ifdef's in those two functions.
- Move declaration of 'vio_timeout' into "vio_priv.h"
Diffstat (limited to 'sql/sql_repl.cc')
| -rw-r--r-- | sql/sql_repl.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc index b451c612398..86ededd5587 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -94,7 +94,7 @@ static int send_file(THD *thd) the job */ old_timeout= net->read_timeout; - net_set_read_timeout(net, thd->variables.net_wait_timeout); + my_net_set_read_timeout(net, thd->variables.net_wait_timeout); /* We need net_flush here because the client will not know it needs to send @@ -138,7 +138,7 @@ static int send_file(THD *thd) error = 0; err: - net_set_read_timeout(net, old_timeout); + my_net_set_read_timeout(net, old_timeout); if (fd >= 0) (void) my_close(fd, MYF(0)); if (errmsg) |