From: Alexander Nozdrin
Date: May 6 2011 11:40am
Subject: bzr commit into mysql-5.5 branch (alexander.nozdrin:3497)
List-Archive: http://lists.mysql.com/commits/136821
Message-Id: <201105061140.p46BeRej012986@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6409311805717208554=="

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

#At file:///home/alik/MySQL/bzr/00/bug60025/mysql-5.5-bug60025/ based on revid:alexander.nozdrin@stripped

 3497 Alexander Nozdrin	2011-05-06
      The user-visible problem was that the server started to consume memory if a
      stored-routine of some sort is executed subsequently. The memory was freed
      only after the corresponding connection was closed.
      
      Technically, the problem was that the memory needed for temporary string
      conversions was allocated on the connection ("persistent") memory root,
      instead of statement one.
      
      The root cause of this problem was the incorrect patch for Bug 55744.
      That patch wrongly fixed a crash in prepared-statement-mode introduced by
      another patch. The patch for Bug 55744 used wrong condition to check if
      prepared statement mode is active (or whether the connection-scoped or
      statement-scoped memory root should be used). The thing is that for
      prepared statements such conversions should be done in the connection
      memory root, so that that the transformations of item-tree were correctly
      remembered in the PREPARE-phase.
      
      The fix is to use proper condition to detect prepared-statement-mode and
      use proper memory root.

    modified:
      sql/item.cc
=== modified file 'sql/item.cc'
--- a/sql/item.cc	2011-05-06 11:39:40 +0000
+++ b/sql/item.cc	2011-05-06 11:40:22 +0000
@@ -1781,14 +1781,17 @@ bool agg_item_set_converter(DTCollation
   }
 
   THD *thd= current_thd;
-  Query_arena *arena, backup;
   bool res= FALSE;
   uint i;
+
   /*
     In case we're in statement prepare, create conversion item
     in its memory: it will be reused on each execute.
   */
-  arena= thd->activate_stmt_arena_if_needed(&backup);
+  Query_arena backup;
+  Query_arena *arena= thd->stmt_arena->is_stmt_prepare() ?
+                      thd->activate_stmt_arena_if_needed(&backup) :
+                      NULL;
 
   for (i= 0, arg= args; i < nargs; i++, arg+= item_sep)
   {


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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: alexander.nozdrin@stripped\
#   gym9tfv4lqzam6t1
# target_branch: file:///home/alik/MySQL/bzr/00/bug60025/mysql-5.5-\
#   bug60025/
# testament_sha1: 60b7078dd7d4be8af2f7b80860d7f0624f2a20c7
# timestamp: 2011-05-06 15:40:25 +0400
# source_branch: file:///home/alik/MySQL/bzr/00/bug60025/mysql-5.5/
# base_revision_id: alexander.nozdrin@stripped\
#   vi12q2mulw2cr768
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWStXA6EAAfP/gAAQEABRd///
8gV2AL/v//BQBaZqsVt7lbJIinTICUSYhoAmU9MQUDamTDU8TUM0T1AlIp6ND1JtU/VPRPJP0UDQ
DRoAyGgCU0mgk2poZT0IMqeo2o/VDQMBD1AHMAmAEwAAmAAJgACSIRoE2plHpoqb8ip6n6mo9Rpi
HqGjIaUTJTk3Szm853XZa5GvFwtmoU6qQVOChqryihni9tm/h60WM3uxAkCR/F+fGtVUH+idGyLa
pasV90bryN7o8ILm27gcm17vXiqaw2nSfDGo6j5uWk9EYWoYfSKO8oVAph/t4J7tsq9+y8VSmqUi
CS4SKImKoKU/LZFsJJ7HuoGwYU6lScc5WCrPUyd1NzTI6v5Ry0R1Pxw0SlG0kg7IXlfJzz9Z86Tw
NMjQY9SnVezeNph4COPvrKd8iLccAXuznC9cXwgqUIhlVELbFm0XzANsBus0ucshG0YXCBpRA/oO
MS3jHNQULMKjUVjZvENUuWJMauLzvUlEMyG1ohQIRNrtdbXPZAJ5wzKGCakqepsqoqml0Im7dn5l
JTZbSvSzTQ4ypzJMESgQioboRFwypwdDIk0KD+oMvPgGBqrqKmzjcVcMHa3hFNLweRYl01lnRYbM
RAoYLy25kePdBLeeJMkQvYNH6Ngp1En2WziEtXW0fgOkNcjOwlvdaeOIYSiD2LluqUzBZMnKqo80
iSiO7cLBZBSNRKnpbhAuKlbtxmasroobKmNTVN5osWutwPKg9igWNTDbwFpSlxlg6L7Hvk1WLkIw
TVNImEq2+Xld7zj3p59lMTDt5/O9SaREPbKiAqi+Dz3atn9/TnqnSEqRCrD38C4pWm9Q2xcuDBsU
IxVcGGZ3L9lcf76OO82qdyIes9JQrIY1B4B1Owz/T9q54ip42y+QLpDXNH1X+M6Jy/gTNm5giuD0
qjEaM4zb8fLabz4uSGHJMuXm/SJWnCf89q9iZe+Hyb3moZNybzVq8aKTsNKzMZuBw+0wkZgrBTG1
GJN6jIiyDYbNlPxLrswxuWUk8FZ4ngriQLCn3mBuSUe4K6wodcubLs3po9zSNnIcnJOOQiiztOtQ
b5cqZji34+U+4VrBBfl/z5RtB+2C8c1HOqcczmpMqj536yxPnNdf3itko/NzRtoa4uM6TOhx3dN5
dFCAGNOJ4VNOUgWsPw+yVZMe43uvLr4BgC64Kqs6hmdjLQ/PvwJ1HM7EDP3e2igem0BY8nxloNPk
JlDD39Ow32NsQIL4eiZhIQkkljOR1RoSqdjgEzqHN+lN7rL2sp9xK5m0EVTJmF4BK8U+qVP579Is
xkkyRQqj2cGIl03lzzwN5X6+K+JVueIRP6NQiTCcA6nbvNIcdevkC5NU067RPEKbflGGQxgvMQwW
izFDcI2wlDUODDi9mRpfPvzJzStsHv4L3BHe0wQwOwOkNWiyyLMDA0A60CPCUCQq3divtZjXKGir
4gziBM5TFdGymtHTmIapFTWEGA84G0fSs1kFaZQEwy3MK2X3f8kYhe0QmsIx4JMY0Rq3I4esUjad
qeGdCTWIwJioOZlvWYVTxVuN4qJWpxBCIprK45hTB1sw7DMkuQOku+rwjK0dyLEudICLUV4xoWcd
wVtwccrlE0LETitPaWK5Ni7syTsnN4CV3WLyZSk/GxTm1UW1fPLGloMpmLGjS2tnNvD4Lds9HJtI
4vlftcyClGpLdmt8HfJQ4ScQL3DS6ENscgIg7PR9LaBAWFXs5QNvUTo/lkil7lLY35HDIxGKmWTF
FaDIgn0hBWMq5yJdBu31P3N8TTUK/eNxp0ZZT9LBcTJZsZI0DM5hcB5DE5ITeY6zqVqBmZmGGLxZ
8dBUBWln/i7kinChIFauB0I=


--===============6409311805717208554==--