Merge with 3.23.55

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)

1 files changed, 6 insertions, 0 deletions

diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c
index 152177c0fbe..130e6b1556a 100644
--- a/libmysql/libmysql.c
+++ b/libmysql/libmysql.c
@@ -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;