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 /server-tools | |
| 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 'server-tools')
| -rw-r--r-- | server-tools/instance-manager/mysql_connection.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/server-tools/instance-manager/mysql_connection.cc b/server-tools/instance-manager/mysql_connection.cc index 3e1694e24ee..2b377d60ad0 100644 --- a/server-tools/instance-manager/mysql_connection.cc +++ b/server-tools/instance-manager/mysql_connection.cc @@ -112,8 +112,8 @@ C_MODE_START void my_net_local_init(NET *net) { net->max_packet= net_buffer_length; - net->read_timeout= net_read_timeout; - net->write_timeout= net_write_timeout; + my_net_set_read_timeout(net, (uint)net_read_timeout); + my_net_set_write_timeout(net, (uint)net_write_timeout); net->retry_count= net_retry_count; net->max_packet_size= max_allowed_packet; } |