List:Commits« Previous MessageNext Message »
From:Dmitry Shulga Date:January 11 2011 3:37pm
Subject:bzr push into mysql-5.5 branch (Dmitry.Shulga:3235 to 3236) Bug#58887
View as plain text  
 3236 Dmitry Shulga	2011-01-11 [merge]
      Auto-merge mysql-5.1 -> mysql-5.5 for bug#58887.

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

    modified:
      mysys/my_getsystime.c
=== 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));


Attachment: [text/bzr-bundle] bzr/dmitry.shulga@oracle.com-20110111152631-jezu2dbglg05g6ff.bundle
Thread
bzr push into mysql-5.5 branch (Dmitry.Shulga:3235 to 3236) Bug#58887Dmitry Shulga11 Jan