diff options
Diffstat (limited to 'sql/mini_client.cc')
| -rw-r--r-- | sql/mini_client.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/mini_client.cc b/sql/mini_client.cc index a50bef4bbca..f6a5d6af8ae 100644 --- a/sql/mini_client.cc +++ b/sql/mini_client.cc @@ -107,6 +107,8 @@ static my_bool is_NT(void) } #endif +extern ulong slave_net_timeout; + /* ** Create a named pipe connection */ @@ -197,6 +199,7 @@ MYSQL *mc_mysql_init(MYSQL *mysql) #ifdef __WIN__ mysql->options.connect_timeout=20; #endif + mysql->net.timeout = slave_net_timeout; return mysql; } @@ -652,7 +655,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) |