From: Dmitry Shulga
Date: January 11 2011 3:37pm
Subject: bzr push into mysql-trunk branch (Dmitry.Shulga:3485 to 3486)
List-Archive: http://lists.mysql.com/commits/128444
Message-Id: <201101111537.p0BEuvIk000330@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7636040364037100851=="

--===============7636040364037100851==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

 3486 Dmitry Shulga	2011-01-11 [merge]
      Merge of mysql-5.5 into mysql-trunk.

    modified:
      sql/net_serv.cc
 3485 Davi Arnaut	2011-01-11 [merge]
      Merge of mysql-5.5 into mysql-trunk.

    modified:
      mysys/my_getsystime.c
=== modified file 'sql/net_serv.cc'
--- a/sql/net_serv.cc	2010-12-29 00:38:59 +0000
+++ b/sql/net_serv.cc	2011-01-11 15:33:55 +0000
@@ -164,17 +164,7 @@ my_bool net_realloc(NET *net, size_t len
   DBUG_ENTER("net_realloc");
   DBUG_PRINT("enter",("length: %lu", (ulong) length));
 
-  /*
-    When compression is off, net->where_b is always 0.
-    With compression turned on, net->where_b may indicate
-    that we still have a piece of the previous logical
-    packet in the buffer, unprocessed. Take it into account
-    when checking that max_allowed_packet is not exceeded.
-    This ensures that the client treats max_allowed_packet
-    limit identically, regardless of compression being on
-    or off.
-  */
-  if (length >= (net->max_packet_size + net->where_b))
+  if (length >= net->max_packet_size)
   {
     DBUG_PRINT("error", ("Packet too large. Max size: %lu",
                          net->max_packet_size));


--===============7636040364037100851==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/dmitry.shulga@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: dmitry.shulga@stripped\
#   uvff16i445mk2spu
# target_branch: file:///Users/shulga/projects/mysql/mysql-trunk/
# testament_sha1: fc8ed9b141a7651d169a2a4b23bcaa84c4d336c3
# timestamp: 2011-01-11 21:37:28 +0600
# source_branch: file:///Users/shulga/projects/mysql/mysql-5.5/
# base_revision_id: davi.arnaut@stripped\
#   r7lqmol54vjn68b8
# 
# Begin bundle
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


--===============7636040364037100851==--