Merge with global tree

BitKeeper/etc/logging_ok:
  auto-union
client/mysqltest.c:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
innobase/include/dict0dict.h:
  Auto merged
libmysql/errmsg.c:
  Auto merged
myisam/mi_open.c:
  Auto merged
myisam/mi_write.c:
  Auto merged
mysql-test/r/grant.result:
  Auto merged
mysql-test/r/merge.result:
  Auto merged
mysql-test/r/show_check.result:
  Auto merged
mysql-test/t/derived.test:
  Auto merged
mysql-test/t/merge.test:
  Auto merged
mysql-test/t/show_check.test:
  Auto merged
mysql-test/t/system_mysql_db_fix.test:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
sql/table.h:
  Auto merged
sql/tztime.h:
  Auto merged

1 files changed, 4 insertions, 11 deletions

diff --git a/sql/sql_base.cc b/sql/sql_base.cc
index eef5bf73b95..950f6c7125d 100644
--- a/sql/sql_base.cc
+++ b/sql/sql_base.cc
@@ -18,7 +18,6 @@
 /* Basic functions needed by many modules */
 
 #include "mysql_priv.h"
-#include "sql_acl.h"
 #include "sql_select.h"
 #include "sp_head.h"
 #include "sql_trigger.h"
@@ -2067,10 +2066,10 @@ find_field_in_table(THD *thd, TABLE_LIST *table_list,
                     uint *cached_field_index_ptr,
                     bool register_tree_change)
 {
-  DBUG_ENTER("find_field_in_table");
-  DBUG_PRINT("enter", ("table:%s name: %s item name %s, ref 0x%lx",
-		       table_list->alias, name, item_name, (ulong)ref));
   Field *fld;
+  DBUG_ENTER("find_field_in_table");
+  DBUG_PRINT("enter", ("table: '%s'  name: '%s'  item name: '%s'  ref 0x%lx",
+		       table_list->alias, name, item_name, (ulong) ref));
   if (table_list->field_translation)
   {
     DBUG_ASSERT(ref != 0 && table_list->view != 0);
@@ -2097,10 +2096,7 @@ find_field_in_table(THD *thd, TABLE_LIST *table_list,
                                            item_name);
           /* as far as Item_ref have defined reference it do not need tables */
           if (register_tree_change && item_ref)
-          {
             thd->change_item_tree(ref, item_ref);
-            (*ref)->fix_fields(thd, 0, ref);
-          }
         }
 	DBUG_RETURN((Field*) view_ref_found);
       }
@@ -2788,6 +2784,7 @@ TABLE_LIST **make_leaves_list(TABLE_LIST **list, TABLE_LIST *tables)
 bool setup_tables(THD *thd, TABLE_LIST *tables, Item **conds,
                   TABLE_LIST **leaves, bool refresh, bool select_insert)
 {
+  uint tablenr= 0;
   DBUG_ENTER("setup_tables");
   /*
     this is used for INSERT ... SELECT.
@@ -2800,13 +2797,9 @@ bool setup_tables(THD *thd, TABLE_LIST *tables, Item **conds,
     DBUG_RETURN(0);
   tables->setup_is_done= 1;
 
-
   if (!(*leaves))
-  {
     make_leaves_list(leaves, tables);
-  }
 
-  uint tablenr= 0;
   for (TABLE_LIST *table_list= *leaves;
        table_list;
        table_list= table_list->next_leaf, tablenr++)