bk commit into 5.0 tree (gshchepa:1.2592) BUG#34830

[<gshchepa]

Below is the list of changes that have just been committed into a local
5.0 repository of gshchepa.  When gshchepa 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@stripped, 2008-02-29 15:11:11+04:00, gshchepa@stripped +1 -0
  Fixed bug #34830: mixed table and field names in Item_ref
                    and Item_direct_ref constructor calls.
  
  Order of ref->field_name and ref->table_name arguments
  is of Item_ref and Item_direct_ref in the fix_inner_refs
  function is inverted.

  sql/sql_select.cc@stripped, 2008-02-29 15:02:47+04:00, gshchepa@stripped +4 -4
    Fixed bug #34830: mixed table and field names in Item_ref
                      and Item_direct_ref constructor calls.
    
    Order of ref->field_name and ref->table_name arguments
    is of Item_ref and Item_direct_ref in the fix_inner_refs
    function is inverted. See definitions:
    
      Item_ref(Name_resolution_context *context_arg, Item **item,
               const char *table_name_arg, const char *field_name_arg,
               bool alias_name_used_arg= FALSE)
      and
    
      Item_direct_ref(Name_resolution_context *context_arg, Item **item,
                      const char *table_name_arg,
                      const char *field_name_arg,
                      bool alias_name_used_arg= FALSE)

diff -Nrup a/sql/sql_select.cc b/sql/sql_select.cc
--- a/sql/sql_select.cc	2008-02-18 19:12:32 +04:00
+++ b/sql/sql_select.cc	2008-02-29 15:02:47 +04:00
@@ -360,10 +360,10 @@ fix_inner_refs(THD *thd, List<Item> &all
       }
     }
     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;