From: Alexander Nozdrin
Date: April 22 2011 11:44am
Subject: bzr commit into mysql-5.5 branch (alexander.nozdrin:3459) Bug#11848763
List-Archive: http://lists.mysql.com/commits/135952
X-Bug: 11848763
Message-Id: <201104221144.p3MBiG0G010063@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2096693461400458639=="

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

 3459 Alexander Nozdrin	2011-04-22
      Patch for Bug#11848763 / 60025
      (SUBSTRING inside a stored function works too slow).
      
      The problem was the incorrect patch for Bug 55744.
      That patch wrongly fixed a bug introduced by another patch.

    modified:
      sql/item.cc
=== modified file 'sql/item.cc'
--- a/sql/item.cc	2011-04-22 11:36:14 +0000
+++ b/sql/item.cc	2011-04-22 11:44:11 +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)
   {


--===============2096693461400458639==
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\
#   ais3wkb4jm7ao77s
# target_branch: file:///home/alik/MySQL/bzr/00/bug60025/mysql-5.5/
# testament_sha1: 2c9991b4caa0ff68e761c571d67c9cd6377713c0
# timestamp: 2011-04-22 15:44:14 +0400
# base_revision_id: alexander.nozdrin@stripped\
#   1mxgd4fq88h2fp9y
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWWYdiIMAAaX/gAAQEABZc///
8qV+AL////BQBBl7XSZ3TbQxShKJMkyZTMIJ6myR5TQMjRiDIZqNNBpTT1NDT1Ayp+mkmQ9R6gAw
QwgABJITEAJok/UaaT9UPUwCAbUyDQaDmmJgI0wIwjAAAAEwjASUJpo0CMU9TaTCekyjaTyahoGg
A0tru5IZu8fyfbZLbzThnYOdlbas2S217Xz20PqyAcDvdTs+G5mYMuC8oTa1i1n06So4eqcoz11t
5LE7+HnkPe/xPu6A3TJiurhGOeK4mGew3y352dFGG5lhGKJJ3zyVY8vB/i28VBcI/RRgzYK/T+TR
rlxNtOMeFawSI7Ei0sqfpkAnbeey2FoxuENB+p5vYRJ7yUUMULyrZ02y1ligw5kgrsvKU8GDxGkn
7O6sUoi4RzlhJJmIxC4tRxEhgqhhQ9xF2Ly06RiYRiRCQCDaHmCDgQURCEltMNOBmsCniT7QhPgy
DzqskGlkjwiw0dZKaLtYnWwZRqcFIxMFcVCL870pcSOJIRwaPIfugNgto4uRsI7ft0aWXowcZsjr
XXAOmNcphH3gT1XAIpa50EQeZQYwnDBtc4sk7VBzTBgqSKigsQTRVcFAphKu0xkNDBxHMGlRXdiQ
vBywVIxcT1UJxTzNeQhoGzG+q2xyJbHFNDRucUUPTRagmEot4V19Rq6OXn2XPcb+7SlSKBEM0cKq
i27Xxvzvmf+ve5dUt7dVt4WPQYyVZOdQsdz8WkjpSsY8NhlqiPG8fTiNMmHRI868xKWPDaKgKywV
n3rkxQcgTHnEwz8U4KxDb4Uq9+qcns2nVsEy/GuzYfmBkG2lpoEsTr9uyIabkaZA3EfUla2OVUEu
IhedW0JD0cp9dhh03h+AlbWortdxwT6de8hMkCvoImhyBQxNhj53ne0FGzpdUNM9XdbMdjYzg6np
V4aGszST5MlVGCdXQZnVQvq/5sJpUvoncihFMoJidFTWVUEIRAoJ15jXsGXnjuvzlUDu7eshQaoF
3PfwHHfrcE9ASA12hZBYiFW+tGYGdgeWlMpbecC0HGLNZV7fFUNe6csTi6YEzUFDTyxskhSF4t+8
NuYyhZNu1C0cBnQU0hgHU8+piDyIRcG6VIYcv7eC6t08/K0uKeYhl/hOxVfJea6Y74xJVLrB/bUT
cyckNYjSmGLA4FnF7bYdyRqujUhhkywnjMUVmCijufqY2lJ5pEEbnqfbBdFvJwekbMOVVA/0Zcbm
TKJVheXTozlOYptKQqORRKV4MSTUl2umc0Q+O2kmq4gpgr5z8RlJ/OSpYGOwu7HLcKptcYYrSy+Q
OmsMeng0+qw66SwJtho1zco5tpqgDmxWNJp4OOL5yduuLgsUmRch7FT23nWeh8smbjWUeuNC0hEz
2ewTMhjwUNIeA5X8etMMd4OI52AqSf/F3JFOFCQZh2IgwA==


--===============2096693461400458639==--