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.blaudden:/home/msvensson/mysql/bug26664/my50-bug26664

Browse Source 
into  pilot.blaudden:/home/msvensson/mysql/bug26664/my51-bug26664
This commit is contained in:
msvensson@pilot.blaudden
2007-05-24 20:43:12 +02:00
parent e2d216450a 93b1fe65d8
commit 5d22eb6552
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)