Merge pilot.mysql.com:/home/msvensson/mysql/bug22943/my41-bug22943

into  pilot.mysql.com:/home/msvensson/mysql/bug22943/my50-bug22943


sql/mysqld.cc:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql-common/client.c:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
vio/vio.c:
  Auto merged
vio/viossl.c:
  Auto merged
sql/mysql_priv.h:
  Manual merge
sql/sql_parse.cc:
  Manual merge

1 files changed, 7 insertions, 1 deletions

diff --git a/sql-common/client.c b/sql-common/client.c
index bcba50548ca..a627619550a 100644
--- a/sql-common/client.c
+++ b/sql-common/client.c
@@ -2044,11 +2044,17 @@ CLI_MYSQL_REAL_CONNECT(MYSQL *mysql,const char *host, const char *user,
     goto error;
   }
   vio_keepalive(net->vio,TRUE);
-  /* Override local client variables */
+
+  /* If user set read_timeout, let it override the default */
   if (mysql->options.read_timeout)
     net->read_timeout= mysql->options.read_timeout;
+  vio_timeout(net->vio, 0, net->read_timeout);
+
+  /* If user set write_timeout, let it override the default */
   if (mysql->options.write_timeout)
     net->write_timeout= mysql->options.write_timeout;
+  vio_timeout(net->vio, 1, net->write_timeout);
+
   if (mysql->options.max_allowed_packet)
     net->max_packet_size= mysql->options.max_allowed_packet;