bk commit into 5.0 tree (bell:1.1923)

[sanja]

Below is the list of changes that have just been committed into a local
5.0 repository of bell. When bell 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.1923 05/04/30 19:27:22 bell@stripped +3 -0
  postreview changes

  sql/sql_base.cc
    1.238 05/04/30 19:27:18 bell@stripped +5 -2
    fixed comment
    changed parameters order

  sql/item.h
    1.117 05/04/30 19:27:18 bell@stripped +1 -1
    changed parameters order

  sql/item.cc
    1.114 05/04/30 19:27:18 bell@stripped +2 -2
    changed parameters order

# 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:	bell
# Host:	sanja.is.com.ua
# Root:	/home/bell/mysql/bk/work-test-5.0

--- 1.113/sql/item.cc	Sat Apr 30 01:43:31 2005
+++ 1.114/sql/item.cc	Sat Apr 30 19:27:18 2005
@@ -2367,8 +2367,8 @@
   SYNOPSIS
     mark_select_range_as_dependent()
     thd           - thread handler
-    current_sel   - current select (select where resolved_item was placed)
     last_select   - select where resolved_item was resolved
+    current_sel   - current select (select where resolved_item was placed)
     found_field   - field which was found during resolving
     found_item    - Item which was found during resolving (if resolved
                     identifier belongs to VIEW)
@@ -2383,8 +2383,8 @@
 */
 
 void mark_select_range_as_dependent(THD *thd,
-                                    SELECT_LEX *current_sel,
                                     SELECT_LEX *last_select,
+                                    SELECT_LEX *current_sel,
                                     Field *found_field, Item *found_item,
                                     Item_ident *resolved_item)
 {

--- 1.116/sql/item.h	Fri Apr 29 02:43:09 2005
+++ 1.117/sql/item.h	Sat Apr 30 19:27:18 2005
@@ -1797,8 +1797,8 @@
 
 class st_select_lex;
 void mark_select_range_as_dependent(THD *thd,
-                                    st_select_lex *current_sel,
                                     st_select_lex *last_select,
+                                    st_select_lex *current_sel,
                                     Field *found_field, Item *found_item,
                                     Item_ident *resolved_item);
 

--- 1.237/sql/sql_base.cc	Sat Apr 30 01:43:31 2005
+++ 1.238/sql/sql_base.cc	Sat Apr 30 19:27:18 2005
@@ -2692,9 +2692,12 @@
       {
         SELECT_LEX *current_sel= thd->lex->current_select;
         SELECT_LEX *last_select= item->cached_table->select_lex;
-        /* check that field was resolved in outer query */
+        /*
+          If the field was an outer referencee, mark all selects using this
+          sub query as dependent of the outer query
+        */
         if (current_sel != last_select)
-          mark_select_range_as_dependent(thd, current_sel, last_select,
+          mark_select_range_as_dependent(thd, last_select, current_sel,
                                          found, *ref, item);
       }
       return found;