bk commit into 5.0 tree (sergefp:1.2251) BUG#21477

[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-01 13:23:43+04:00, sergefp@stripped +4 -0
  BUG#21477 "memory overruns for certain kinds of subqueries":
  make st_select_lex::setup_ref_array() take into account that 
  Item_sum-descendant objects located within descendant SELECTs
  may be added into ref_pointer_array.

  sql/item_sum.cc@stripped, 2006-09-01 13:23:38+04:00, sergefp@stripped +3 -1
    BUG#21477 "memory overruns for certain kinds of subqueries":
    Make SELECT_LEX::n_sum_items contain # of Item_sum-derived objects
    that exist within this SELECT.

  sql/sql_lex.cc@stripped, 2006-09-01 13:23:38+04:00, sergefp@stripped +4 -4
    BUG#21477 "memory overruns for certain kinds of subqueries":
    make st_select_lex::setup_ref_array() take into account that 
    Item_sum-descendant objects located within descendant SELECTs
    may be added into ref_pointer_array.

  sql/sql_lex.h@stripped, 2006-09-01 13:23:38+04:00, sergefp@stripped +7 -1
    BUG#21477 "memory overruns for certain kinds of subqueries":
    Add SELECT_LEX::n_sum_items and SELECT_LEXT::n_child_sum_items.

  sql/sql_yacc.yy@stripped, 2006-09-01 13:23:38+04:00, sergefp@stripped +2 -0
    BUG#21477 "memory overruns for certain kinds of subqueries":
    Make SELECT_LEX::n_sum_items contain # of Item_sum-derived objects
    that exist within this SELECT.

# 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-look-64bit

--- 1.179/sql/item_sum.cc	2006-09-01 13:23:48 +04:00
+++ 1.180/sql/item_sum.cc	2006-09-01 13:23:48 +04:00
@@ -290,7 +290,9 @@
 
 void Item_sum::mark_as_sum_func()
 {
-  current_thd->lex->current_select->with_sum_func= 1;
+  SELECT_LEX *cur_select= current_thd->lex->current_select;
+  cur_select->n_sum_items++;
+  cur_select->with_sum_func= 1;
   with_sum_func= 1;
 }
 

--- 1.195/sql/sql_lex.cc	2006-09-01 13:23:49 +04:00
+++ 1.196/sql/sql_lex.cc	2006-09-01 13:23:49 +04:00
@@ -1521,10 +1521,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.225/sql/sql_lex.h	2006-09-01 13:23:49 +04:00
+++ 1.226/sql/sql_lex.h	2006-09-01 13:23:49 +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.480/sql/sql_yacc.yy	2006-09-01 13:23:49 +04:00
+++ 1.481/sql/sql_yacc.yy	2006-09-01 13:23:49 +04:00
@@ -8927,8 +8927,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;
 	};
 
 /**************************************************************************