bk commit into 5.0 tree (gkodinov:1.2376)

[kgeorge]

Below is the list of changes that have just been committed into a local
5.0 repository of kgeorge. When kgeorge 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, 2007-01-11 19:13:04+02:00, gkodinov@stripped +1 -0
  Merge gkodinov@stripped:/home/bk/mysql-5.0-opt
  into  rakia.gmz:/home/kgeorge/mysql/autopush/B25106-5.0-opt
  MERGE: 1.2365.2.1

  sql/sql_base.cc@stripped, 2007-01-11 19:13:00+02:00, gkodinov@stripped +0 -0
    Auto merged
    MERGE: 1.360.1.1

# 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:	rakia.gmz
# Root:	/home/kgeorge/mysql/autopush/B25106-5.0-opt/RESYNC

--- 1.362/sql/sql_base.cc	2007-01-10 12:03:35 +02:00
+++ 1.363/sql/sql_base.cc	2007-01-11 19:13:00 +02:00
@@ -2975,6 +2975,19 @@ find_field_in_natural_join(THD *thd, TAB
       column reference. See create_view_field() for details.
     */
     item= nj_col->create_item(thd);
+    /*
+     *ref != NULL means that *ref contains the item that we need to
+     replace. If the item was aliased by the user, set the alias to
+     the replacing item.
+     We need to set alias on both ref itself and on ref real item.
+     */
+    if (*ref && !(*ref)->is_autogenerated_name)
+    {
+      item->set_name((*ref)->name, (*ref)->name_length,
+                     system_charset_info);
+      item->real_item()->set_name((*ref)->name, (*ref)->name_length,
+                                  system_charset_info);
+    }
     if (register_tree_change && arena)
       thd->restore_active_arena(arena, &backup);