bk commit into 5.0 tree (sergefp:1.2293)

[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-11-01 00:54:49+03:00, sergefp@stripped +2 -0
  Merge spetrunia@stripped:/home/bk/mysql-5.0-opt
  into  mysql.com:/home/psergey/mysql-5.0-bug8804-r4
  MERGE: 1.2289.3.3

  sql/sql_lex.cc@stripped, 2006-11-01 00:54:45+03:00, sergefp@stripped +0 -0
    Auto merged
    MERGE: 1.202.1.1

  sql/sql_lex.h@stripped, 2006-11-01 00:54:45+03:00, sergefp@stripped +0 -0
    Auto merged
    MERGE: 1.229.1.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:	pylon.mylan
# Root:	/home/psergey/mysql-5.0-bug8804-r4/RESYNC

--- 1.203/sql/sql_lex.cc	2006-11-01 00:54:53 +03:00
+++ 1.204/sql/sql_lex.cc	2006-11-01 00:54:53 +03:00
@@ -1181,7 +1181,7 @@
   select_limit= 0;      /* denotes the default limit = HA_POS_ERROR */
   offset_limit= 0;      /* denotes the default offset = 0 */
   with_sum_func= 0;
-
+  is_correlated= 0;
 }
 
 /*
@@ -1375,6 +1375,8 @@
       SELECT_LEX_UNIT *munit= s->master_unit();
       munit->uncacheable|= UNCACHEABLE_DEPENDENT;
     }
+  is_correlated= TRUE;
+  this->master_unit()->item->is_correlated= TRUE;
 }
 
 bool st_select_lex_node::set_braces(bool value)      { return 1; }

--- 1.230/sql/sql_lex.h	2006-11-01 00:54:53 +03:00
+++ 1.231/sql/sql_lex.h	2006-11-01 00:54:53 +03:00
@@ -470,7 +470,7 @@
   void set_thd(THD *thd_arg) { thd= thd_arg; }
 
   friend void lex_start(THD *thd, uchar *buf, uint length);
-  friend int subselect_union_engine::exec();
+  friend int subselect_union_engine::exec(bool);
 
   List<Item> *get_unit_column_types();
 };
@@ -562,6 +562,8 @@
     query processing end even if we use temporary table
   */
   bool subquery_in_having;
+  /* TRUE <=> this SELECT is correlated w.r.t. some ancestor select */
+  bool is_correlated;
   /*
     This variable is required to ensure proper work of subqueries and
     stored procedures. Generally, one should use the states of