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/sql_repl.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/sql_repl.cc')
| -rw-r--r-- | sql/sql_repl.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc index 88a752f7acb..01b1149a2b3 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -91,8 +91,8 @@ static int send_file(THD *thd) The client might be slow loading the data, give him wait_timeout to do the job */ - old_timeout = thd->net.read_timeout; - thd->net.read_timeout = thd->variables.net_wait_timeout; + old_timeout= net->read_timeout; + 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 @@ -136,7 +136,7 @@ static int send_file(THD *thd) error = 0; err: - thd->net.read_timeout = old_timeout; + net_set_read_timeout(net, old_timeout); if (fd >= 0) (void) my_close(fd, MYF(0)); if (errmsg) |