1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00

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
This commit is contained in:
unknown
2007-05-24 20:43:12 +02:00
13 changed files with 56 additions and 45 deletions

View File

@@ -2047,13 +2047,11 @@ CLI_MYSQL_REAL_CONNECT(MYSQL *mysql,const char *host, const char *user,
/* 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);
my_net_set_read_timeout(net, mysql->options.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);
my_net_set_write_timeout(net, mysql->options.write_timeout);
if (mysql->options.max_allowed_packet)
net->max_packet_size= mysql->options.max_allowed_packet;