summaryrefslogtreecommitdiff
path: root/sql/mini_client.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/mini_client.cc
parent2547e933c8c03249f5295aa71a50ce2b35fc3dd8 (diff)
downloadmariadb-git-076bdd6cc33aa2d9f5c100540fa50cb3b1ff288d.tar.gz
Another try to fix slave timeouts
Diffstat (limited to 'sql/mini_client.cc')
-rw-r--r--sql/mini_client.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/mini_client.cc b/sql/mini_client.cc
index 8f703b80e3a..453f27822d9 100644
--- a/sql/mini_client.cc
+++ b/sql/mini_client.cc
@@ -112,6 +112,8 @@ static my_bool is_NT(void)
}
#endif
+extern ulong slave_net_timeout;
+
/*
** Create a named pipe connection
*/
@@ -203,6 +205,7 @@ mc_mysql_init(MYSQL *mysql)
#ifdef __WIN__
mysql->options.connect_timeout=20;
#endif
+ mysql->net.timeout = slave_net_timeout;
return mysql;
}
@@ -655,7 +658,7 @@ mc_mysql_connect(MYSQL *mysql,const char *host, const char *user,
goto error;
}
vio_keepalive(net->vio,TRUE);
-
+ net->timeout=slave_net_timeout;
/* Get version info */
mysql->protocol_version= PROTOCOL_VERSION; /* Assume this */
if ((pkt_length=mc_net_safe_read(mysql)) == packet_error)