database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge with 3.23.55

Browse Source 
BitKeeper/deleted/.del-net.c~ef21d6402bb882f9:
  Auto merged
innobase/os/os0file.c:
  Auto merged
libmysql/Makefile.am:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
Build-tools/Do-compile:
  Use local version
Makefile.am:
  remove double libmysql_r
configure.in:
  Use local
libmysql/libmysql.c:
  Dont abort connection if too big packet error
sql/ha_innodb.cc:
  use local
sql/net_serv.cc:
  use local
sql/sql_parse.cc:
  Merge with 3.23.55 (fix double free of user)
This commit is contained in:
unknown
2003-01-25 15:31:07 +02:00
parent db47e4ca24 4886e3d2d4
commit 49e0eea578
7 changed files with 34 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libmysql/libmysql.c
View File

@ -485,6 +485,12 @@ simple_command(MYSQL *mysql,enum enum_server_command command, const char *arg,
length ? length : (ulong) strlen(arg)))
{
DBUG_PRINT("error",("Can't send command to server. Error: %d",socket_errno));
if (net->last_errno == ER_NET_PACKET_TOO_LARGE)
{
net->last_errno=CR_NET_PACKET_TOO_LARGE;
strmov(net->last_error,ER(net->last_errno));
goto end;
}
end_server(mysql);
if (mysql_reconnect(mysql))
goto end;