Merge maint2.mysql.com:/data/localhome/tsmith/bk/mrg50/50

into  maint2.mysql.com:/data/localhome/tsmith/bk/mrg50/51

1 files changed, 7 insertions, 1 deletions

diff --git a/sql/sql_lex.h b/sql/sql_lex.h
index ce0af39a041..64426dd45d6 100644
--- a/sql/sql_lex.h
+++ b/sql/sql_lex.h
@@ -575,6 +575,12 @@ public:
   bool  braces;   	/* SELECT ... UNION (SELECT ... ) <- this braces */
   /* TRUE when having fix field called in processing of this SELECT */
   bool having_fix_field;
+
+  /* Number of Item_sum-derived objects in this SELECT */
+  uint n_sum_items;
+  /* Number of Item_sum-derived objects in children and descendant SELECTs */
+  uint n_child_sum_items;
+
   /* explicit LIMIT clause was used */
   bool explicit_limit;
   /*
@@ -667,7 +673,7 @@ public:
   bool test_limit();
 
   friend void lex_start(THD *thd, const uchar *buf, uint length);
-  st_select_lex() {}
+  st_select_lex() : n_sum_items(0), n_child_sum_items(0) {}
   void make_empty_select()
   {
     init_query();