diff options
| author | unknown <msvensson@pilot.mysql.com> | 2007-01-29 16:19:59 +0100 |
|---|---|---|
| committer | unknown <msvensson@pilot.mysql.com> | 2007-01-29 16:19:59 +0100 |
| commit | 5776283ec4d2dc7c398363fee4a6a4a2dc331456 (patch) | |
| tree | 9b45fe93786dddb9a205ea89aa100026abc046fa /sql/set_var.cc | |
| parent | 6211aac56bff1b20aa233d780116f44de6db962c (diff) | |
| parent | a195ad5ea26227dac0d5f503b9e37717b2bc40be (diff) | |
| download | mariadb-git-5776283ec4d2dc7c398363fee4a6a4a2dc331456.tar.gz | |
Merge pilot.mysql.com:/home/msvensson/mysql/bug22943/my41-bug22943
into pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
sql/mysql_priv.h:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
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 30724c78a62..57bb93ef4b1 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -1128,14 +1128,14 @@ static void fix_tx_isolation(THD *thd, enum_var_type type) 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) |