postreview changes

sql/item.cc

@@ -2367,8 +2367,8 @@ static void mark_as_dependent(THD *thd, SELECT_LEX *last, SELECT_LEX *current,
   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 @@ static void mark_as_dependent(THD *thd, SELECT_LEX *last, SELECT_LEX *current,
 */
 
 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)
 {

sql/item.h

@@ -1797,8 +1797,8 @@ class Item_type_holder: public Item
 
 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);
 

sql/sql_base.cc

@@ -2692,9 +2692,12 @@ find_field_in_tables(THD *thd, Item_ident *item, TABLE_LIST *tables,
       {
         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;