sql_yacc.yy:

- Moving select_options_and_item_list from select_init2
  to select_init and view_select_aux
- Renaming select_init2 to select_init3
This will simplify upcoming sql_yacc.yy fixes (e.g. MDEV-10035, MDEV-8909).

1 files changed, 4 insertions, 7 deletions

diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index 178d21d6c1a..a4d67a36d9c 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -8518,9 +8518,8 @@ select:
           }
         ;
 
-/* Need select_init2 for subselects. */
 select_init:
-          SELECT_SYM select_init2
+          SELECT_SYM select_options_and_item_list select_init3
         | '(' select_paren ')' union_opt
         ;
 
@@ -8558,8 +8557,7 @@ select_paren_derived:
         | '(' select_paren_derived ')'
         ;
 
-select_init2:
-          select_options_and_item_list
+select_init3:
           opt_table_expression
           opt_select_lock_type
           {
@@ -8567,8 +8565,7 @@ select_init2:
             Lex->current_select->set_braces(false);
           }
           union_clause
-        | select_options_and_item_list
-          select_part3_union_not_ready
+        | select_part3_union_not_ready
           opt_select_lock_type
           {
             /* Parentheses carry no meaning here */
@@ -16638,7 +16635,7 @@ view_select:
         ;
 
 view_select_aux:
-          SELECT_SYM select_init2
+          SELECT_SYM select_options_and_item_list select_init3
         | '(' select_paren ')' union_opt
         ;