Merge rurik.mysql.com:/home/igor/mysql-5.0

into rurik.mysql.com:/home/igor/dev/mysql-5.0-2


sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

1 files changed, 0 insertions, 2 deletions

diff --git a/sql/sql_class.cc b/sql/sql_class.cc
index 609156ef5a8..0391585a02b 100644
--- a/sql/sql_class.cc
+++ b/sql/sql_class.cc
@@ -1561,7 +1561,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),
@@ -1582,7 +1581,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;