1 files changed, 8 insertions, 2 deletions
diff --git a/sql/sql_lex.h b/sql/sql_lex.h
index b57fba08b47..a2da6f672ca 100644
--- a/sql/sql_lex.h
+++ b/sql/sql_lex.h
@@ -727,7 +727,13 @@ public:
   Item *prep_having;/* saved HAVING clause for prepared statement processing */
   /* Saved values of the WHERE and HAVING clauses*/
   Item::cond_result cond_value, having_value;
-  /* point on lex in which it was created, used in view subquery detection */
+  /*
+     Point on lex in which it was created, used in view subquery detection.
+
+     TODO: make also st_select_lex::parent_stmt_lex (see THD::stmt_lex)
+     and use st_select_lex::parent_lex & st_select_lex::parent_stmt_lex
+     instead of global (from THD) references where it is possible.
+  */
   LEX *parent_lex;
   enum olap_type olap;
   /* FROM clause - points to the beginning of the TABLE_LIST::next_local list. */
@@ -2452,7 +2458,7 @@ struct LEX: public Query_tables_list
   /** SELECT of CREATE VIEW statement */
   LEX_STRING create_view_select;
 
-  uint number_of_selects; // valid only for view
+  uint current_select_number; // valid for statmet LEX (not view)
 
   /** Start of 'ON table', in trigger statements.  */
   const char* raw_trg_on_table_name_begin;