diff options
| author | msvensson@pilot.blaudden <> | 2007-05-24 20:43:12 +0200 |
|---|---|---|
| committer | msvensson@pilot.blaudden <> | 2007-05-24 20:43:12 +0200 |
| commit | 5d22eb6552ef44ed932235b06d938e5e3a169689 (patch) | |
| tree | c8363ff07bf3105b416bf81980b0f9609df81738 /sql/sql_repl.cc | |
| parent | e2d216450a71660f9de3c9e3094453a3c80042d5 (diff) | |
| parent | 93b1fe65d82661f29b1f6e1ad341eb0f68f4c93c (diff) | |
| download | mariadb-git-5d22eb6552ef44ed932235b06d938e5e3a169689.tar.gz | |
Merge pilot.blaudden:/home/msvensson/mysql/bug26664/my50-bug26664
into pilot.blaudden:/home/msvensson/mysql/bug26664/my51-bug26664
Diffstat (limited to 'sql/sql_repl.cc')
| -rw-r--r-- | sql/sql_repl.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc index d68dcf81282..5b9d76bb2c3 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -96,7 +96,7 @@ static int send_file(THD *thd) the job */ old_timeout= net->read_timeout; - net_set_read_timeout(net, thd->variables.net_wait_timeout); + my_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 @@ -140,7 +140,7 @@ static int send_file(THD *thd) error = 0; err: - net_set_read_timeout(net, old_timeout); + my_net_set_read_timeout(net, old_timeout); if (fd >= 0) (void) my_close(fd, MYF(0)); if (errmsg) |