Merge mysql.com:/home/jimw/my/mysql-5.0-clean

into  mysql.com:/home/jimw/my/mysql-5.1-clean


mysql-test/r/sp.result:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/sql_base.cc:
  Resolve conflict

1 files changed, 0 insertions, 2 deletions

diff --git a/sql/sql_class.cc b/sql/sql_class.cc
index 4ebb521567c..3c91e81c57a 100644
--- a/sql/sql_class.cc
+++ b/sql/sql_class.cc
@@ -1580,7 +1580,6 @@ Statement::Statement(enum enum_state state_arg, ulong id_arg,
   :Query_arena(&main_mem_root, state_arg),
   id(id_arg),
   set_query_id(1),
-  allow_sum_func(0),
   lex(&main_lex),
   query(0),
   query_length(0),
@@ -1601,7 +1600,6 @@ void Statement::set_statement(Statement *stmt)
 {
   id=             stmt->id;
   set_query_id=   stmt->set_query_id;
-  allow_sum_func= stmt->allow_sum_func;
   lex=            stmt->lex;
   query=          stmt->query;
   query_length=   stmt->query_length;