After merge fixes

Added THD to add_to_xxx_list() functions for faster parsing.


heap/_check.c:
  After merge fix
mysql-test/r/distinct.result:
  After merge fix
mysql-test/r/multi_update.result:
  Make timestamp test portable
mysql-test/t/multi_update.test:
  Make timestamp test portable
sql/field.cc:
  After merge fix
sql/item_sum.cc:
  After merge fix
sql/log_event.cc:
  Remove compiler warning
sql/mysql_priv.h:
  Added THD to add_to_list (Faster parsing)
sql/sql_derived.cc:
  Fixed parameters to create_tmp_table()
sql/sql_lex.cc:
  Added THD to add_to_list (Faster parsing)
sql/sql_lex.h:
  Added THD to add_to_list (Faster parsing)
sql/sql_parse.cc:
  Added THD to add_to_list (Faster parsing)
sql/sql_select.cc:
  After merge fixes
  Fixed return values from JOIN::optimize()
  Replaced test_function_query with '!tables_list'
  Optimized arguments to create_tmp_table()
sql/sql_select.h:
  Removed test_function_query variable
  Updated prototypes
sql/sql_union.cc:
  Updated argument lists.
sql/sql_update.cc:
  After merge fixes
sql/sql_yacc.yy:
  Added THD to all add_xxx_to_list() functions
sql/table.h:
  After merge fix

1 files changed, 8 insertions, 8 deletions

diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc
index 54f28668644..833f36dbe9f 100644
--- a/sql/sql_lex.cc
+++ b/sql/sql_lex.cc
@@ -1098,19 +1098,19 @@ st_select_lex* st_select_lex_node::select_lex()
   DBUG_RETURN(0);
 }
 
-bool st_select_lex_node::add_item_to_list(Item *item)
+bool st_select_lex_node::add_item_to_list(THD *thd, Item *item)
 {
   return 1;
 }
 
-bool st_select_lex_node::add_group_to_list(Item *item, bool asc)
+bool st_select_lex_node::add_group_to_list(THD *thd, Item *item, bool asc)
 {
   return 1; 
 }
 
-bool st_select_lex_node::add_order_to_list(Item *item, bool asc)
+bool st_select_lex_node::add_order_to_list(THD *thd, Item *item, bool asc)
 { 
-  return add_to_list(order_list,item,asc);
+  return add_to_list(thd, order_list,item,asc);
 }
 
 bool st_select_lex_node::add_ftfunc_to_list(Item_func_match *func)
@@ -1166,7 +1166,7 @@ TABLE_LIST* st_select_lex_node::get_table_list()     { return 0; }
 List<Item>* st_select_lex_node::get_item_list()      { return 0; }
 List<String>* st_select_lex_node::get_use_index()    { return 0; }
 List<String>* st_select_lex_node::get_ignore_index() { return 0; }
-TABLE_LIST *st_select_lex_node::add_table_to_list(Table_ident *table,
+TABLE_LIST *st_select_lex_node::add_table_to_list(THD *thd, Table_ident *table,
 						  LEX_STRING *alias,
 						  bool updating,
 						  thr_lock_type flags,
@@ -1269,14 +1269,14 @@ st_select_lex* st_select_lex::select_lex()
   return this;
 }
 
-bool st_select_lex::add_item_to_list(Item *item)
+bool st_select_lex::add_item_to_list(THD *thd, Item *item)
 {
   return item_list.push_back(item);
 }
 
-bool st_select_lex::add_group_to_list(Item *item, bool asc)
+bool st_select_lex::add_group_to_list(THD *thd, Item *item, bool asc)
 {
-  return add_to_list(group_list, item, asc);
+  return add_to_list(thd, group_list, item, asc);
 }
 
 bool st_select_lex::add_ftfunc_to_list(Item_func_match *func)