Merge mysql.com:/home/gluh/MySQL/Merge/5.1

into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt

1 files changed, 4 insertions, 0 deletions

diff --git a/sql/sql_lex.h b/sql/sql_lex.h
index 8e9eb578911..247c35ca73a 100644
--- a/sql/sql_lex.h
+++ b/sql/sql_lex.h
@@ -615,6 +615,10 @@ public:
   bool no_wrap_view_item;
   /* exclude this select from check of unique_table() */
   bool exclude_from_table_unique_test;
+  /* List of fields that aren't under an aggregate function */
+  List<Item_field> non_agg_fields;
+  /* index in the select list of the expression currently being fixed */
+  int cur_pos_in_select_list;
 
   void init_query();
   void init_select();