Commit 00b942eb authored by gshchepa/uchum@host.loc's avatar gshchepa/uchum@host.loc
Browse files

Merge host.loc:/home/uchum/work/5.0-opt-34830 

into  host.loc:/home/uchum/work/5.0-opt
parents 0596b1c6 3bf9c7ed

sql/sql_select.cc

+4 −4
Original line number Diff line number Diff line
@@ -360,10 +360,10 @@ fix_inner_refs(THD *thd, List<Item> &all_fields, SELECT_LEX *select, 
      }

    }

    new_ref= direct_ref ?

              new Item_direct_ref(ref->context, item_ref, ref->field_name,

                          ref->table_name, ref->alias_name_used) :

              new Item_ref(ref->context, item_ref, ref->field_name,

                          ref->table_name, ref->alias_name_used);

              new Item_direct_ref(ref->context, item_ref, ref->table_name,

                          ref->field_name, ref->alias_name_used) :

              new Item_ref(ref->context, item_ref, ref->table_name,

                          ref->field_name, ref->alias_name_used);

    if (!new_ref)

      return TRUE;

    ref->outer_ref= new_ref;