cleanup sql_yacc.yy: remove redundant ev_sql_stmt_inner rule

vuvova · vuvova · commit 932100c813d9 · 2014-10-10T22:27:39.000+02:00
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
@@ -2621,7 +2621,7 @@ ev_sql_stmt:
             lex->sp_chistics.suid= SP_IS_SUID;  //always the definer!
             lex->sphead->set_body_start(thd, lip->get_cpp_ptr());
           }
-          ev_sql_stmt_inner
+          sp_proc_stmt
           {
             LEX *lex= thd->lex;
 
@@ -2633,22 +2633,6 @@ ev_sql_stmt:
           }
         ;
 
-ev_sql_stmt_inner:
-          sp_proc_stmt_statement
-        | sp_proc_stmt_return
-        | sp_proc_stmt_if
-        | case_stmt_specification
-        | sp_labeled_block
-        | sp_unlabeled_block
-        | sp_labeled_control
-        | sp_unlabeled_control
-        | sp_proc_stmt_leave
-        | sp_proc_stmt_iterate
-        | sp_proc_stmt_open
-        | sp_proc_stmt_fetch
-        | sp_proc_stmt_close
-        ;
-
 clear_privileges:
           /* Nothing */
           {

Original file line number	Diff line number	Diff line change
`@@ -2621,7 +2621,7 @@ ev_sql_stmt:`
`2621`	`2621`	`lex->sp_chistics.suid= SP_IS_SUID; //always the definer!`
`2622`	`2622`	`lex->sphead->set_body_start(thd, lip->get_cpp_ptr());`
`2623`	`2623`	`}`
`2624`		`- ev_sql_stmt_inner`
	`2624`	`+ sp_proc_stmt`
`2625`	`2625`	`{`
`2626`	`2626`	`LEX *lex= thd->lex;`
`2627`	`2627`
`@@ -2633,22 +2633,6 @@ ev_sql_stmt:`
`2633`	`2633`	`}`
`2634`	`2634`	`;`
`2635`	`2635`
`2636`		`-ev_sql_stmt_inner:`
`2637`		`- sp_proc_stmt_statement`
`2638`		`- \| sp_proc_stmt_return`
`2639`		`- \| sp_proc_stmt_if`
`2640`		`- \| case_stmt_specification`
`2641`		`- \| sp_labeled_block`
`2642`		`- \| sp_unlabeled_block`
`2643`		`- \| sp_labeled_control`
`2644`		`- \| sp_unlabeled_control`
`2645`		`- \| sp_proc_stmt_leave`
`2646`		`- \| sp_proc_stmt_iterate`
`2647`		`- \| sp_proc_stmt_open`
`2648`		`- \| sp_proc_stmt_fetch`
`2649`		`- \| sp_proc_stmt_close`
`2650`		`- ;`
`2651`		`-`
`2652`	`2636`	`clear_privileges:`
`2653`	`2637`	`/* Nothing */`
`2654`	`2638`	`{`