database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Merge pilot.blaudden:/home/msvensson/mysql/bug26664/my50-bug26664

Browse Source 
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
This commit is contained in:
unknown
2007-05-24 20:43:12 +02:00
parent a27fd67b51 945f3c2cc8
commit 71eb1afef1
13 changed files with 56 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_repl.cc
View File

@@ -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)