diff options
| author | unknown <msvensson@pilot.blaudden> | 2007-05-24 20:43:12 +0200 |
|---|---|---|
| committer | unknown <msvensson@pilot.blaudden> | 2007-05-24 20:43:12 +0200 |
| commit | 71eb1afef15c103ff096104eef22049b8b4b0957 (patch) | |
| tree | c8363ff07bf3105b416bf81980b0f9609df81738 /sql/sql_repl.cc | |
| parent | a27fd67b512bace048a8c9b0cce7faf5cbbd1373 (diff) | |
| parent | 945f3c2cc827ca6acc06a1034538f4ec1388ac5b (diff) | |
| download | mariadb-git-71eb1afef15c103ff096104eef22049b8b4b0957.tar.gz | |
Merge pilot.blaudden:/home/msvensson/mysql/bug26664/my50-bug26664
into pilot.blaudden:/home/msvensson/mysql/bug26664/my51-bug26664
include/mysql_com.h:
Auto merged
include/violite.h:
Auto merged
libmysql/libmysql.c:
Auto merged
server-tools/instance-manager/mysql_connection.cc:
Auto merged
sql-common/client.c:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/net_serv.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
vio/viosocket.c:
Auto merged
sql/sql_parse.cc:
Merge 5.0->5.1
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) |