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

into host.loc:/home/uchum/work/5.1-opt

Merge host.loc:/home/uchum/work/5.0-opt-34830
into host.loc:/home/uchum/work/5.1-opt
6d242206 · gshchepa/uchum@host.loc · 56e06f6c · 3bf9c7ed · 6d242206
Commit 6d242206 authored Mar 01, 2008 by gshchepa/uchum@host.loc
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

sql/sql_select.cc sql/sql_select.cc +4 -4

No files found.
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -371,10 +371,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,
+              new Item_direct_ref(ref->context, item_ref, ref->table_name,
-                          ref->table_name, ref->alias_name_used) :
+                          ref->field_name, ref->alias_name_used) :
-              new Item_ref(ref->context, item_ref, ref->field_name,
+              new Item_ref(ref->context, item_ref, ref->table_name,
-                          ref->table_name, ref->alias_name_used);
+                          ref->field_name, ref->alias_name_used);
    if (!new_ref)
      return TRUE;
    ref->outer_ref= new_ref;