1 files changed, 41 insertions, 70 deletions

diff --git a/sql/item.cc b/sql/item.cc
index 1319d5c4b62..2fe5411f972 100644
--- a/sql/item.cc
+++ b/sql/item.cc
@@ -70,12 +70,11 @@ bool cmp_items(Item *a, Item *b)
 /**
   Set max_sum_func_level if it is needed
 */
-inline void set_max_sum_func_level(SELECT_LEX *select)
+inline void set_max_sum_func_level(THD *thd, SELECT_LEX *select)
 {
-  LEX *lex_s= select->parent_lex;
-  if (lex_s->in_sum_func &&
-      lex_s->in_sum_func->nest_level >= select->nest_level)
-    set_if_bigger(lex_s->in_sum_func->max_sum_func_level,
+  if (thd->lex->in_sum_func &&
+      thd->lex->in_sum_func->nest_level >= select->nest_level)
+    set_if_bigger(thd->lex->in_sum_func->max_sum_func_level,
                   select->nest_level - 1);
 }
 
@@ -769,7 +768,6 @@ Item_ident::Item_ident(THD *thd, Name_resolution_context *context_arg,
    cached_table(0), depended_from(0), can_be_depended(TRUE)
 {
   name= *field_name_arg;
-  DBUG_ASSERT(!context || context->select_lex);
 }
 
 
@@ -785,7 +783,6 @@ Item_ident::Item_ident(THD *thd, TABLE_LIST *view_arg,
    cached_table(NULL), depended_from(NULL), can_be_depended(TRUE)
 {
   name= *field_name_arg;
-  DBUG_ASSERT(!context || context->select_lex);
 }
 
 
@@ -807,9 +804,7 @@ Item_ident::Item_ident(THD *thd, Item_ident *item)
    cached_table(item->cached_table),
    depended_from(item->depended_from),
    can_be_depended(item->can_be_depended)
-{
-  DBUG_ASSERT(!context || context->select_lex);
-}
+{}
 
 void Item_ident::cleanup()
 {
@@ -5828,14 +5823,7 @@ Item_field::fix_outer_field(THD *thd, Field **from_field, Item **reference)
   */
   Name_resolution_context *last_checked_context= context;
   Item **ref= (Item **) not_found_item;
-  /*
-    There are cases when name resolution context is absent (when we are not
-    doing name resolution), but here the name resolution context should
-    be present because we are doing name resolution
-  */
-  DBUG_ASSERT(context);
-  SELECT_LEX *current_sel=  context->select_lex;
-  LEX *lex_s= context->select_lex->parent_lex;
+  SELECT_LEX *current_sel= thd->lex->current_select;
   Name_resolution_context *outer_context= 0;
   SELECT_LEX *select= 0;
   /* Currently derived tables cannot be correlated */
@@ -5936,18 +5924,19 @@ Item_field::fix_outer_field(THD *thd, Field **from_field, Item **reference)
               return -1;
             thd->change_item_tree(reference, rf);
             select->inner_refs_list.push_back(rf, thd->mem_root);
-            rf->in_sum_func= lex_s->in_sum_func;
+            rf->in_sum_func= thd->lex->in_sum_func;
           }
           /*
             A reference is resolved to a nest level that's outer or the same as
             the nest level of the enclosing set function : adjust the value of
             max_arg_level for the function if it's needed.
           */
-          if (lex_s->in_sum_func &&
-              lex_s->in_sum_func->nest_level >= select->nest_level)
+          if (thd->lex->in_sum_func &&
+              thd->lex == context->select_lex->parent_lex &&
+              thd->lex->in_sum_func->nest_level >= select->nest_level)
           {
             Item::Type ref_type= (*reference)->type();
-            set_if_bigger(lex_s->in_sum_func->max_arg_level,
+            set_if_bigger(thd->lex->in_sum_func->max_arg_level,
                           select->nest_level);
             set_field(*from_field);
             fixed= 1;
@@ -5968,10 +5957,11 @@ Item_field::fix_outer_field(THD *thd, Field **from_field, Item **reference)
                             ((ref_type == REF_ITEM || ref_type == FIELD_ITEM) ?
                              (Item_ident*) (*reference) :
                              0), false);
-          if (lex_s->in_sum_func &&
-              lex_s->in_sum_func->nest_level >= select->nest_level)
+          if (thd->lex->in_sum_func &&
+              thd->lex == context->select_lex->parent_lex &&
+              thd->lex->in_sum_func->nest_level >= select->nest_level)
           {
-            set_if_bigger(lex_s->in_sum_func->max_arg_level,
+            set_if_bigger(thd->lex->in_sum_func->max_arg_level,
                           select->nest_level);
           }
           /*
@@ -6063,7 +6053,7 @@ Item_field::fix_outer_field(THD *thd, Field **from_field, Item **reference)
     {
       outer_context->select_lex->inner_refs_list.push_back((Item_outer_ref*)rf,
                                                            thd->mem_root);
-      ((Item_outer_ref*)rf)->in_sum_func= lex_s->in_sum_func;
+      ((Item_outer_ref*)rf)->in_sum_func= thd->lex->in_sum_func;
     }
     thd->change_item_tree(reference, rf);
     /*
@@ -6078,7 +6068,7 @@ Item_field::fix_outer_field(THD *thd, Field **from_field, Item **reference)
       We can not "move" aggregate function in the place where
       its arguments are not defined.
     */
-    set_max_sum_func_level(select);
+    set_max_sum_func_level(thd, select);
     mark_as_dependent(thd, last_checked_context->select_lex,
                       context->select_lex, rf,
                       rf, false);
@@ -6091,7 +6081,7 @@ Item_field::fix_outer_field(THD *thd, Field **from_field, Item **reference)
       We can not "move" aggregate function in the place where
       its arguments are not defined.
     */
-    set_max_sum_func_level(select);
+    set_max_sum_func_level(thd, select);
     mark_as_dependent(thd, last_checked_context->select_lex,
                       context->select_lex,
                       this, (Item_ident*)*reference, false);
@@ -6169,20 +6159,7 @@ bool Item_field::fix_fields(THD *thd, Item **reference)
   DBUG_ASSERT(fixed == 0);
   Field *from_field= (Field *)not_found_field;
   bool outer_fixed= false;
-  SELECT_LEX *select;
-  LEX *lex_s;
-  if (context)
-  {
-    select= context->select_lex;
-    lex_s= context->select_lex->parent_lex;
-  }
-  else
-  {
-    // No real name resolution, used somewhere in SP
-    DBUG_ASSERT(field);
-    select= NULL;
-    lex_s= NULL;
-  }
+  SELECT_LEX *select= thd->lex->current_select;
 
   if (select && select->in_tvc)
   {
@@ -6250,7 +6227,7 @@ bool Item_field::fix_fields(THD *thd, Item **reference)
               We can not "move" aggregate function in the place where
               its arguments are not defined.
             */
-            set_max_sum_func_level(select);
+            set_max_sum_func_level(thd, select);
             set_field(new_field);
             depended_from= (*((Item_field**)res))->depended_from;
             return 0;
@@ -6278,7 +6255,7 @@ bool Item_field::fix_fields(THD *thd, Item **reference)
               We can not "move" aggregate function in the place where
               its arguments are not defined.
             */
-            set_max_sum_func_level(select);
+            set_max_sum_func_level(thd, select);
             return FALSE;
           }
         }
@@ -6315,11 +6292,12 @@ bool Item_field::fix_fields(THD *thd, Item **reference)
         goto mark_non_agg_field;
     }
 
-    if (lex_s &&
-        lex_s->in_sum_func &&
-        lex_s->in_sum_func->nest_level ==
+    if (!thd->lex->current_select->no_wrap_view_item &&
+        thd->lex->in_sum_func &&
+        thd->lex == select->parent_lex &&
+        thd->lex->in_sum_func->nest_level == 
         select->nest_level)
-      set_if_bigger(lex_s->in_sum_func->max_arg_level,
+      set_if_bigger(thd->lex->in_sum_func->max_arg_level,
                     select->nest_level);
     /*
       if it is not expression from merged VIEW we will set this field.
@@ -6385,9 +6363,8 @@ bool Item_field::fix_fields(THD *thd, Item **reference)
   if (field->vcol_info)
     fix_session_vcol_expr_for_read(thd, field, field->vcol_info);
   if (thd->variables.sql_mode & MODE_ONLY_FULL_GROUP_BY &&
-      !outer_fixed &&
+      !outer_fixed && !thd->lex->in_sum_func &&
       select &&
-      !lex_s->in_sum_func &&
       select->cur_pos_in_select_list != UNDEF_POS &&
       select->join)
   {
@@ -6422,13 +6399,13 @@ mark_non_agg_field:
       */
       select_lex= context->select_lex;
     }
-    if (!lex_s || !lex_s->in_sum_func)
+    if (!thd->lex->in_sum_func)
       select_lex->set_non_agg_field_used(true);
     else
     {
       if (outer_fixed)
-        lex_s->in_sum_func->outer_fields.push_back(this, thd->mem_root);
-      else if (lex_s->in_sum_func->nest_level !=
+        thd->lex->in_sum_func->outer_fields.push_back(this, thd->mem_root);
+      else if (thd->lex->in_sum_func->nest_level !=
           select->nest_level)
         select_lex->set_non_agg_field_used(true);
     }
@@ -7705,12 +7682,6 @@ Item *get_field_item_for_having(THD *thd, Item *item, st_select_lex *sel)
   return NULL; 
 }
 
-Item *Item_ident::derived_field_transformer_for_having(THD *thd, uchar *arg)
-{
-  st_select_lex *sel= (st_select_lex *)arg;
-  context= &sel->context;
-  return this;
-}
 
 Item *Item_field::derived_field_transformer_for_having(THD *thd, uchar *arg)
 {
@@ -7730,13 +7701,12 @@ Item *Item_field::derived_field_transformer_for_having(THD *thd, uchar *arg)
 Item *Item_direct_view_ref::derived_field_transformer_for_having(THD *thd,
                                                                  uchar *arg)
 {
-  st_select_lex *sel= (st_select_lex *)arg;
-  context= &sel->context;
   if ((*ref)->marker & SUBSTITUTION_FL)
   {
     this->marker|= SUBSTITUTION_FL;
     return this;
   }
+  st_select_lex *sel= (st_select_lex *)arg;
   table_map tab_map= sel->master_unit()->derived->table->map;
   if ((item_equal && !(item_equal->used_tables() & tab_map)) ||
       !item_equal)
@@ -8033,9 +8003,7 @@ bool Item_ref::fix_fields(THD *thd, Item **reference)
 {
   enum_parsing_place place= NO_MATTER;
   DBUG_ASSERT(fixed == 0);
-
-  SELECT_LEX *current_sel= context->select_lex;
-  LEX *lex_s= context->select_lex->parent_lex;
+  SELECT_LEX *current_sel= thd->lex->current_select;
 
   if (set_properties_only)
   {
@@ -8196,10 +8164,11 @@ bool Item_ref::fix_fields(THD *thd, Item **reference)
           the nest level of the enclosing set function : adjust the value of
           max_arg_level for the function if it's needed.
         */
-        if (lex_s->in_sum_func &&
-            lex_s->in_sum_func->nest_level >=
+        if (thd->lex->in_sum_func &&
+            thd->lex == context->select_lex->parent_lex &&
+            thd->lex->in_sum_func->nest_level >= 
             last_checked_context->select_lex->nest_level)
-          set_if_bigger(lex_s->in_sum_func->max_arg_level,
+          set_if_bigger(thd->lex->in_sum_func->max_arg_level,
                         last_checked_context->select_lex->nest_level);
         return FALSE;
       }
@@ -8219,10 +8188,11 @@ bool Item_ref::fix_fields(THD *thd, Item **reference)
         the nest level of the enclosing set function : adjust the value of
         max_arg_level for the function if it's needed.
       */
-      if (lex_s->in_sum_func &&
-          lex_s->in_sum_func->nest_level >=
+      if (thd->lex->in_sum_func &&
+          thd->lex == context->select_lex->parent_lex &&
+          thd->lex->in_sum_func->nest_level >= 
           last_checked_context->select_lex->nest_level)
-        set_if_bigger(lex_s->in_sum_func->max_arg_level,
+        set_if_bigger(thd->lex->in_sum_func->max_arg_level,
                       last_checked_context->select_lex->nest_level);
     }
   }
@@ -9647,6 +9617,7 @@ bool Item_default_value::get_date_result(MYSQL_TIME *ltime,ulonglong fuzzydate)
   return Item_field::get_date_result(ltime, fuzzydate);
 }
 
+
 table_map Item_default_value::used_tables() const
 {
   if (!field || !field->default_value)