diff options
| author | unknown <msvensson@pilot.blaudden> | 2007-05-24 20:51:37 +0200 |
|---|---|---|
| committer | unknown <msvensson@pilot.blaudden> | 2007-05-24 20:51:37 +0200 |
| commit | 6c789278885423044a526a7ce543b30bcb0e425f (patch) | |
| tree | 2db80e621915e71c8554c6396c2ba02df01473a2 /sql-common | |
| parent | e079e2049990159bc3c798303bcab7d954370235 (diff) | |
| parent | 945f3c2cc827ca6acc06a1034538f4ec1388ac5b (diff) | |
| download | mariadb-git-6c789278885423044a526a7ce543b30bcb0e425f.tar.gz | |
Merge pilot.blaudden:/home/msvensson/mysql/bug26664/my50-bug26664
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
libmysql/libmysql.c:
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_parse.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
Diffstat (limited to 'sql-common')
| -rw-r--r-- | sql-common/client.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sql-common/client.c b/sql-common/client.c index 3342db4bcfe..40512da0492 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -2047,13 +2047,11 @@ CLI_MYSQL_REAL_CONNECT(MYSQL *mysql,const char *host, const char *user, /* If user set read_timeout, let it override the default */ if (mysql->options.read_timeout) - net->read_timeout= mysql->options.read_timeout; - vio_timeout(net->vio, 0, net->read_timeout); + my_net_set_read_timeout(net, mysql->options.read_timeout); /* If user set write_timeout, let it override the default */ if (mysql->options.write_timeout) - net->write_timeout= mysql->options.write_timeout; - vio_timeout(net->vio, 1, net->write_timeout); + my_net_set_write_timeout(net, mysql->options.write_timeout); if (mysql->options.max_allowed_packet) net->max_packet_size= mysql->options.max_allowed_packet; |