Merge pilot.blaudden:/home/msvensson/mysql/bug26664/my50-bug26664

into  pilot.blaudden:/home/msvensson/mysql/bug26664/my51-bug26664


include/mysql_com.h:
  Auto merged
include/violite.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
server-tools/instance-manager/mysql_connection.cc:
  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_repl.cc:
  Auto merged
vio/viosocket.c:
  Auto merged
sql/sql_parse.cc:
  Merge 5.0->5.1

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 293d90420b1..91629adfd51 100644
--- a/server-tools/instance-manager/mysql_connection.cc
+++ b/server-tools/instance-manager/mysql_connection.cc
@@ -62,8 +62,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;
 }