diff options
| author | msvensson@pilot.mysql.com <> | 2007-02-06 14:44:05 +0100 |
|---|---|---|
| committer | msvensson@pilot.mysql.com <> | 2007-02-06 14:44:05 +0100 |
| commit | 256cb08ba9c06a619ad52610ccbec28815e8766f (patch) | |
| tree | b6759c4bcd7a2db701145b582e202997ba869824 /sql/sql_repl.cc | |
| parent | 6502f4300bf36246ef5265d3859673865fe87df3 (diff) | |
| parent | 36207f8088e0f5b84eb426cd40d27dffcfa39168 (diff) | |
| download | mariadb-git-256cb08ba9c06a619ad52610ccbec28815e8766f.tar.gz | |
Merge 192.168.0.10:mysql/mysql-4.1-maint
into pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
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 a20f2a6506c..f83313a8fd8 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -89,8 +89,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 @@ -134,7 +134,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) |