bk commit into 4.1 tree (msvensson:1.2142) BUG#8807

[msvensson]

Below is the list of changes that have just been committed into a local
4.1 repository of msvensson. When msvensson 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
  1.2142 05/03/30 11:53:22 msvensson@neptunus.(none) +1 -0
  BUG#8807 Select crash server

  sql/item.cc
    1.196 05/03/30 11:50:32 msvensson@neptunus.(none) +14 -12
    Updated loop after review

# 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:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/bug8807

--- 1.195/sql/item.cc	2005-03-24 19:13:30 +01:00
+++ 1.196/sql/item.cc	2005-03-30 11:50:32 +02:00
@@ -1325,21 +1325,23 @@
   SELECT_LEX *cursel= (SELECT_LEX *) thd->lex->current_select;
 
   /*
-    Parameters in a subsleect should mark the subselect as not constant
+    Parameters in a subselect should mark the subselect as not constant
     during prepare
   */
-  if ((state == NO_VALUE) &&
-      cursel->master_unit()->first_select()->linkage != DERIVED_TABLE_TYPE)
+  if (state == NO_VALUE)
   {
-    SELECT_LEX_UNIT *prev_unit= cursel->master_unit();
-    for (SELECT_LEX *outer_sel= prev_unit->outer_select();
-         outer_sel;
-         outer_sel= (prev_unit= outer_sel->master_unit())->outer_select())
-      {
-        Item_subselect *prev_subselect_item= prev_unit->item;
-        prev_subselect_item->used_tables_cache|= OUTER_REF_TABLE_BIT;
-        prev_subselect_item->const_item_cache= 0;
-      }
+    /*
+      SELECT_LEX_UNIT::item set only for subqueries, so test of it presence
+      can be barrier to stop before derived table SELECT or very outer SELECT
+    */
+    for(;
+        cursel->master_unit()->item;
+        cursel= cursel->outer_select())
+    {
+      Item_subselect *subselect_item= cursel->master_unit()->item;
+      subselect_item->used_tables_cache|= OUTER_REF_TABLE_BIT;
+      subselect_item->const_item_cache= 0;
+    }
   }
   fixed= 1;
   return 0;