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 | 6277ac02c0879f20c351792e19d741921d56a0ed (patch) | |
| tree | 2db80e621915e71c8554c6396c2ba02df01473a2 /libmysql | |
| parent | 14adb5a7e4d68550c5450a962e300780e5eae32a (diff) | |
| parent | e8faa0b701d23137ccdc5c5fa6f68fd2b131024e (diff) | |
| download | mariadb-git-6277ac02c0879f20c351792e19d741921d56a0ed.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 'libmysql')
| -rw-r--r-- | libmysql/libmysql.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index e80684a1b1e..e426d2c549e 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -67,8 +67,6 @@ ulong net_buffer_length=8192; ulong max_allowed_packet= 1024L*1024L*1024L; -ulong net_read_timeout= CLIENT_NET_READ_TIMEOUT; -ulong net_write_timeout= CLIENT_NET_WRITE_TIMEOUT; #ifdef EMBEDDED_LIBRARY @@ -1528,8 +1526,8 @@ my_bool STDCALL mysql_embedded(void) void my_net_local_init(NET *net) { net->max_packet= (uint) net_buffer_length; - net->read_timeout= (uint) net_read_timeout; - net->write_timeout=(uint) net_write_timeout; + my_net_set_read_timeout(net, CLIENT_NET_READ_TIMEOUT); + my_net_set_write_timeout(net, CLIENT_NET_WRITE_TIMEOUT); net->retry_count= 1; net->max_packet_size= max(net_buffer_length, max_allowed_packet); } |