diff options
| author | unknown <msvensson@pilot.mysql.com> | 2007-01-29 14:33:53 +0100 |
|---|---|---|
| committer | unknown <msvensson@pilot.mysql.com> | 2007-01-29 14:33:53 +0100 |
| commit | 7620e066dbf16f170ce1a5baa516eb7c560c9a51 (patch) | |
| tree | 5ff0b0c41c572069a02dbb2c6eabec3d10d8900d /sql/set_var.cc | |
| parent | 39fb7b2423c01b168ca4947307426edb945abfe2 (diff) | |
| parent | a195ad5ea26227dac0d5f503b9e37717b2bc40be (diff) | |
| download | mariadb-git-7620e066dbf16f170ce1a5baa516eb7c560c9a51.tar.gz | |
Merge pilot.mysql.com:/home/msvensson/mysql/bug22943/my41-bug22943
into pilot.mysql.com:/home/msvensson/mysql/bug22943/my50-bug22943
sql/mysqld.cc:
Auto merged
sql/net_serv.cc:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql-common/client.c:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
vio/vio.c:
Auto merged
vio/viossl.c:
Auto merged
sql/mysql_priv.h:
Manual merge
sql/sql_parse.cc:
Manual merge
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 9b02a192fe5..be9d73a091c 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -1273,14 +1273,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) - thd->net.read_timeout=thd->variables.net_read_timeout; + 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) - thd->net.write_timeout=thd->variables.net_write_timeout; + net_set_write_timeout(&thd->net, thd->variables.net_write_timeout); } static void fix_net_retry_count(THD *thd, enum_var_type type) |