From: Dmitry Shulga
Date: December 30 2010 9:44am
Subject: bzr commit into mysql-5.1 branch (Dmitry.Shulga:3531) Bug#58887
List-Archive: http://lists.mysql.com/commits/127706
X-Bug: 58887
Message-Id: <201012300945.oBU8rWhG012362@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2273830183144024587=="

--===============2273830183144024587==
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.1-bug58887/ based on revid:alexander.nozdrin@stripped

 3531 Dmitry Shulga	2010-12-30
      Fixed Bug#58887	- server not throwing "Packet too large" error
      if max_allowed_packet >= 16M.
      
      This bug was introduced by patch for bug#42503.
      
      This patch restores behaviour that there was before patch
      for bug#42503 was applied.
     @ sql/net_serv.cc
        Restored original right condition.

    modified:
      sql/net_serv.cc
=== modified file 'sql/net_serv.cc'
--- a/sql/net_serv.cc	2010-12-28 23:47:05 +0000
+++ b/sql/net_serv.cc	2010-12-30 09:43:53 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (C) 2000 MySQL AB
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -170,17 +170,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));


--===============2273830183144024587==
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\
#   qdssuspgo4cetnz0
# target_branch: file:///Users/shulga/projects/mysql/mysql-5.1-\
#   bug58887/
# testament_sha1: b3e989f263eddfcae928982d4cc103fb13686277
# timestamp: 2010-12-30 15:44:02 +0600
# base_revision_id: alexander.nozdrin@stripped\
#   o0c3f1pqklek1txm
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWfJIFdcAAa9fgEAwWHP/938G
fAC/7//wUARNvFtluwdAAQ1PVT1PFDEB6QPUANAANHqAAI1Ep+lP0aZGIp+hNopo8p6gA0ANADQm
SaYom2qG1GEPUGRkAYJoAOaYmABMAEwAAmAAJgkkI0GkyYp5E0p+RghqYj1EAZG9U2NhF10Jf9qh
kZaAUsiCBb4rSs93XEqMvlPKxKB2eAvAKh2HR1KKbl1VcPhsuqt+QLQ0KZY7oXVV5La+KbzdKuEl
L30OXCwPmvsOq+6skVEd5yCQcJw7ddFD4IE8qosGUivl3rV0WQstn2fHN1c9f+ofIRT3qcXHVO+e
+vsXxB+EB7P0+auF5xmUwhwlN8YD058nHhDX9ykVanVaaqK9OSbZRC24LYOR7cfaCF9GTsjZz1LB
8JxEWmzNCpuRvpLtt8HBxunLoCyuMxdxRhIJBMIBU5ApbK1ECqhQzYJK2gjngQjrfYgDhPG00dME
awBIXLeLGyMIkfBFRbaJ6qoLHDPO4o0sfQuXhYLcXUTRmvc9qryUbzwFgkfcREJHFWwl40gfnWEY
4NtRIVgTPQEBclAadXGLrcRPGHAadImnJsrrqRnghb3MOHqXsNKHzMqbmcKQSBSqdmUz4cH3aKRY
jykeSpNEYm++khU5WuDJpCZlrrUdU1O+I2WQpdNZiKIQffvGySN7PYKGc4mRjQpQAfOMUg4DO2Cl
GkiTXPGrGxGBCNCn0YAST1m8zfeqZ4cqn6Vwh8SO1WnNyMocviYDp484AxpKTfrfFLh37z4Pw3MR
WV53EAweuv5fhNitV8kdOy45tAGcx7950PfvxPLHQbpPevNvENYbLNy+dntoMjQG8ao+ozxbF4bY
syFFIv01B7Nf46fiorW2dOeo0KRBNoWY/3NY1utcVX9hdSy3iekXgsPHfMNwwhsNx6FUetjbXWEg
oJbDeedhpr1VHaeWxtZ91JRcGhE2pi3GRVMbyBgZ5FbBWenKcgmD1+XyLxN3CeFqko0Ga9fU7ljq
89xQX9efq2UcSD6mJiHQNCbiqFgBjyF4K1XXCrvzzZNBO7wffwv5KHYZx1iJswgqNJZ0+YNjProx
KFgiYmerNwRp9J/t+mE99bLlxGC3gg7TF+syWSnlBZB7qdbXJwUhS5f9hTuKhDLNd1a3gbnZM+R8
JHgpdPIi2gsOxqFl418KaCXyTqpy1vX04PmTNpqcDJ4/rMus62P6qfqvS6cURky5iwlUnRFjQbQV
CGxp6zH3ak7CJgcxa5btEFzdLdTBclbyDapcza5kyaecrdFBYbNvVRoolqFQqVzXV7TrZKThaoCT
M5oIa2XNxCbT/EI4Jld+2ojbl71lAwp3DJNIfrc31WufInvki52bP8hVA4oV/Hi0dQtCqyhYUCZw
MbnWiwvmc7B5mPZyPVmngnXYm7jM9c3Va7DOQoyFYiAE7k7yT+682r92wA4VGhhaaUSTXWhaojx6
t/XFPXGg0Ocgb7+TpCjVWqxqFSD/F3JFOFCQ8kgV1w==


--===============2273830183144024587==--