summaryrefslogtreecommitdiff
path: root/sql/slave.cc
diff options
context:
space:
mode:
authorunknown <Sinisa@sinisa.nasamreza.org>2002-07-17 14:46:09 +0300
committerunknown <Sinisa@sinisa.nasamreza.org>2002-07-17 14:46:09 +0300
commit076bdd6cc33aa2d9f5c100540fa50cb3b1ff288d (patch)
tree2471cb78c008d6f0fdd06d1d52c298d8a5bb4bd3 /sql/slave.cc
parent2547e933c8c03249f5295aa71a50ce2b35fc3dd8 (diff)
downloadmariadb-git-076bdd6cc33aa2d9f5c100540fa50cb3b1ff288d.tar.gz
Another try to fix slave timeouts
Diffstat (limited to 'sql/slave.cc')
-rw-r--r--sql/slave.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/sql/slave.cc b/sql/slave.cc
index dd815037d5e..b11fcc0d847 100644
--- a/sql/slave.cc
+++ b/sql/slave.cc
@@ -456,7 +456,7 @@ int fetch_nx_table(THD* thd, MASTER_INFO* mi)
nx_errno = ER_BAD_HOST_ERROR;
goto err;
}
- mysql->net.timeout=slave_net_timeout;
+
safe_connect(thd, mysql, mi);
if (slave_killed(thd))
goto err;
@@ -1312,7 +1312,7 @@ pthread_handler_decl(handle_slave,arg __attribute__((unused)))
goto err;
}
- mysql->net.timeout=slave_net_timeout;
+
thd->proc_info = "connecting to master";
#ifndef DBUG_OFF
sql_print_error("Slave thread initialized");
@@ -1331,7 +1331,8 @@ pthread_handler_decl(handle_slave,arg __attribute__((unused)))
}
connected:
-
+
+ mysql->net.timeout=slave_net_timeout;
while (!slave_killed(thd))
{
thd->proc_info = "Requesting binlog dump";