From: Dmitry Shulga
Date: January 11 2011 3:27pm
Subject: bzr commit into mysql-5.5 branch (Dmitry.Shulga:3236) Bug#58887
List-Archive: http://lists.mysql.com/commits/128440
X-Bug: 58887
Message-Id: <201101111529.p0BF63Bl010208@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3488259476950540226=="

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

#At file:///Users/shulga/projects/mysql/mysql-5.5/ based on revid:davi.arnaut@stripped

 3236 Dmitry Shulga	2011-01-11 [merge]
      Auto-merge mysql-5.1 -> mysql-5.5 for bug#58887.

    modified:
      sql/net_serv.cc
=== modified file 'sql/net_serv.cc'
--- a/sql/net_serv.cc	2010-12-29 00:26:31 +0000
+++ b/sql/net_serv.cc	2011-01-11 15:26:31 +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));


--===============3488259476950540226==
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\
#   jezu2dbglg05g6ff
# target_branch: file:///Users/shulga/projects/mysql/mysql-5.5/
# testament_sha1: 7d72faae14c8bd56f06984e944b08eb95076a033
# timestamp: 2011-01-11 21:27:54 +0600
# source_branch: file:///Users/shulga/projects/mysql/mysql-5.1-\
#   bug58887/
# base_revision_id: davi.arnaut@stripped\
#   v9yoe2laktbyummh
# 
# Begin bundle
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
RThQkIG1bTE=


--===============3488259476950540226==--