From 8d90582a3b36ae8be764b43043fedd03c3db4686 Mon Sep 17 00:00:00 2001 From: Vladislav Vaintroub Date: Thu, 29 Dec 2011 13:37:37 +0100 Subject: Fix valgrind errors with network timeouts. --- sql/net_serv.cc | 2 -- sql/sql_client.cc | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/sql/net_serv.cc b/sql/net_serv.cc index d54fe3e0ebf..4a35dc52fa3 100644 --- a/sql/net_serv.cc +++ b/sql/net_serv.cc @@ -138,8 +138,6 @@ my_bool my_net_init(NET *net, Vio* vio) net->net_skip_rest_factor= 0; net->last_errno=0; net->unused= 0; - net->read_timeout=0; - net->write_timeout=0; if (vio != 0) /* If real connection */ { diff --git a/sql/sql_client.cc b/sql/sql_client.cc index 22a7867012a..9630b92a9fc 100644 --- a/sql/sql_client.cc +++ b/sql/sql_client.cc @@ -29,7 +29,7 @@ void my_net_local_init(NET *net) { #ifndef EMBEDDED_LIBRARY net->max_packet= (uint) global_system_variables.net_buffer_length; - + net->read_timeout= net->write_timeout= 0; my_net_set_read_timeout(net, (uint)global_system_variables.net_read_timeout); my_net_set_write_timeout(net, (uint)global_system_variables.net_write_timeout); -- cgit v1.2.1