diff options
| author | msvensson@pilot.blaudden <> | 2007-05-24 20:43:12 +0200 |
|---|---|---|
| committer | msvensson@pilot.blaudden <> | 2007-05-24 20:43:12 +0200 |
| commit | 5d22eb6552ef44ed932235b06d938e5e3a169689 (patch) | |
| tree | c8363ff07bf3105b416bf81980b0f9609df81738 /libmysql | |
| parent | e2d216450a71660f9de3c9e3094453a3c80042d5 (diff) | |
| parent | 93b1fe65d82661f29b1f6e1ad341eb0f68f4c93c (diff) | |
| download | mariadb-git-5d22eb6552ef44ed932235b06d938e5e3a169689.tar.gz | |
Merge pilot.blaudden:/home/msvensson/mysql/bug26664/my50-bug26664
into pilot.blaudden:/home/msvensson/mysql/bug26664/my51-bug26664
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 374676ebe32..3d734ef7378 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 @@ -1522,8 +1520,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); } |