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/set_var.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/set_var.cc')
| -rw-r--r-- | sql/set_var.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index 46c2a775d8a..bc3cc7b0688 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -1282,14 +1282,14 @@ static int check_completion_type(THD *thd, set_var *var) static void fix_net_read_timeout(THD *thd, enum_var_type type) { if (type != OPT_GLOBAL) - net_set_read_timeout(&thd->net, thd->variables.net_read_timeout); + my_net_set_read_timeout(&thd->net, thd->variables.net_read_timeout); } static void fix_net_write_timeout(THD *thd, enum_var_type type) { if (type != OPT_GLOBAL) - net_set_write_timeout(&thd->net, thd->variables.net_write_timeout); + my_net_set_write_timeout(&thd->net, thd->variables.net_write_timeout); } static void fix_net_retry_count(THD *thd, enum_var_type type) |