bzr commit into mysql-5.5 branch (alexander.nozdrin:3459) Bug#11848763

[Alexander Nozdrin]

#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)
   {


Attachment: [text/bzr-bundle] bzr/[e-mail]