bk commit into 5.0 tree (sergefp:1.2253)

[Sergey Petrunia]

Below is the list of changes that have just been committed into a local
5.0 repository of psergey. When psergey does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-09-03 00:11:41+04:00, sergefp@stripped +3 -0
  Merge spetrunia@stripped:/home/bk/mysql-5.0
  into  mysql.com:/home/psergey/mysql-5.0-bug21477-push
  MERGE: 1.2244.20.2

  sql/sql_lex.cc@stripped, 2006-09-03 00:11:36+04:00, sergefp@stripped +0 -0
    Auto merged
    MERGE: 1.195.1.1

  sql/sql_lex.h@stripped, 2006-09-03 00:11:36+04:00, sergefp@stripped +0 -0
    Auto merged
    MERGE: 1.225.1.1

  sql/sql_yacc.yy@stripped, 2006-09-03 00:11:37+04:00, sergefp@stripped +0 -0
    Auto merged
    MERGE: 1.480.2.1

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	sergefp
# Host:	pylon64.mylan
# Root:	/home/psergey/mysql-5.0-bug21477-push/RESYNC

--- 1.198/sql/sql_lex.cc	2006-09-03 00:11:46 +04:00
+++ 1.199/sql/sql_lex.cc	2006-09-03 00:11:46 +04:00
@@ -1524,10 +1524,10 @@
   */
   Query_arena *arena= thd->stmt_arena;
   return (ref_pointer_array=
-          (Item **)arena->alloc(sizeof(Item*) *
-                                (item_list.elements +
-                                 select_n_having_items +
-                                 order_group_num)* 5)) == 0;
+          (Item **)arena->alloc(sizeof(Item*) * (n_child_sum_items +
+                                                 item_list.elements +
+                                                 select_n_having_items +
+                                                 order_group_num)*5)) == 0;
 }
 
 

--- 1.226/sql/sql_lex.h	2006-09-03 00:11:46 +04:00
+++ 1.227/sql/sql_lex.h	2006-09-03 00:11:46 +04:00
@@ -548,6 +548,12 @@
   bool  braces;   	/* SELECT ... UNION (SELECT ... ) <- this braces */
   /* TRUE when having fix field called in processing of this SELECT */
   bool having_fix_field;
+
+  /* Number of Item_sum-derived objects in this SELECT */
+  uint n_sum_items;
+  /* Number of Item_sum-derived objects in children and descendant SELECTs */
+  uint n_child_sum_items;
+
   /* explicit LIMIT clause was used */
   bool explicit_limit;
   /*
@@ -640,7 +646,7 @@
   bool test_limit();
 
   friend void lex_start(THD *thd, uchar *buf, uint length);
-  st_select_lex() {}
+  st_select_lex() : n_sum_items(0), n_child_sum_items(0) {}
   void make_empty_select()
   {
     init_query();

--- 1.483/sql/sql_yacc.yy	2006-09-03 00:11:46 +04:00
+++ 1.484/sql/sql_yacc.yy	2006-09-03 00:11:46 +04:00
@@ -8954,8 +8954,10 @@
 	{
 	  LEX *lex=Lex;
           lex->pop_context();
+          SELECT_LEX *child= lex->current_select;
 	  lex->current_select = lex->current_select->return_after_parsing();
           lex->nest_level--;
+          lex->current_select->n_child_sum_items += child->n_sum_items;
 	};
 
 /**************************************************************************