bk commit into 5.0 tree (gkodinov:1.2299)

[gkodinov]

Below is the list of changes that have just been committed into a local
5.0 repository of gkodinov. When gkodinov 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, 2006-11-07 14:39:20+01:00, gkodinov@stripped +1 -0
  item.cc:
    merge fixes

  sql/item.cc@stripped, 2006-11-07 14:38:57+01:00, gkodinov@stripped +3 -3
    merge fixes

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	gkodinov
# Host:	dl145s.mysql.com
# Root:	/data/bk/team_tree_merge/MERGE/mysql-5.0-opt

--- 1.239/sql/item.cc	2006-11-07 14:39:25 +01:00
+++ 1.240/sql/item.cc	2006-11-07 14:39:25 +01:00
@@ -3727,16 +3727,16 @@
               Item_ref to point to the Item in the select list and replace the
               Item_field created by the parser with the new Item_ref.
             */
-            Item_ref *rf= new Item_ref(db_name,table_name,field_name);
+            Item_ref *rf= new Item_ref(context, db_name,table_name,field_name);
             if (!rf)
               return 1;
-            thd->change_item_tree(ref, rf);
+            thd->change_item_tree(reference, rf);
             /*
               Because Item_ref never substitutes itself with other items 
               in Item_ref::fix_fields(), we can safely use the original 
               pointer to it even after fix_fields()
              */
-            return rf->fix_fields(thd, tables, ref) ||  rf->check_cols(1);
+            return rf->fix_fields(thd, reference) ||  rf->check_cols(1);
           }
         }
       }