database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge pilot.mysql.com:/home/msvensson/mysql/bug22943/my50-bug22943

Browse Source 
into  pilot.mysql.com:/home/msvensson/mysql/bug22943/my51-bug22943


sql-common/client.c:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
vio/vio.c:
  Auto merged
vio/viossl.c:
  Auto merged
This commit is contained in:
unknown
2007-01-29 14:35:09 +01:00
parent 1d82f97c83 7620e066db
commit a067100e60
9 changed files with 72 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_repl.cc
View File

@ -92,8 +92,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
@ -137,7 +137,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)