database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-06-13 13:01:51 +03:00
Code Activity

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

Browse Source 
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
parent a27fd67b51 945f3c2cc8
commit 71eb1afef1
13 changed files with 56 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libmysql/libmysql.c
View File

@ -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);
}