merging

sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_list.h:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_olap.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

1 files changed, 7 insertions, 3 deletions

diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc
index 716e37b5cb7..764b7650f1d 100644
--- a/sql/sql_lex.cc
+++ b/sql/sql_lex.cc
@@ -996,6 +996,7 @@ int yylex(void *arg, void *yythd)
 void st_select_lex_node::init_query()
 {
   no_table_names_allowed= dependent= 0;
+  ref_pointer_array= 0;
 }
 
 void st_select_lex_node::init_select()
@@ -1019,6 +1020,8 @@ void st_select_lex_unit::init_query()
   union_option= 0;
   prepared= optimized= executed= 0;
   item= 0;
+  union_result= 0;
+  table= 0;
 }
 
 void st_select_lex::init_query()
@@ -1031,6 +1034,7 @@ void st_select_lex::init_query()
   join= 0;
   olap= UNSPECIFIED_OLAP_TYPE;
   having_fix_field= 0;
+  with_wild= 0;
 }
 
 void st_select_lex::init_select()
@@ -1160,12 +1164,12 @@ bool st_select_lex_node::add_item_to_list(THD *thd, Item *item)
 
 bool st_select_lex_node::add_group_to_list(THD *thd, Item *item, bool asc)
 {
-  return 1; 
+  return 1;
 }
 
 bool st_select_lex_node::add_order_to_list(THD *thd, Item *item, bool asc)
-{ 
-  return add_to_list(thd, 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)