Commit 552d4ced authored by unknown's avatar unknown
Browse files

Merge cleanup

parent d70fde4c

sql/sql_yacc.yy

+2 −12
Original line number Diff line number Diff line
@@ -1667,8 +1667,7 @@ ev_sql_stmt_inner: 
          sp_proc_stmt_statement

        | sp_proc_stmt_return

        | sp_proc_stmt_if

        | sp_proc_stmt_case_simple

        | sp_proc_stmt_case

        | case_stmt_specification

        | sp_labeled_control

        | sp_proc_stmt_unlabeled

        | sp_proc_stmt_leave
@@ -2432,8 +2431,7 @@ sp_proc_stmt: 
	  sp_proc_stmt_statement

        | sp_proc_stmt_return

	| sp_proc_stmt_if

	| sp_proc_stmt_case_simple

        | sp_proc_stmt_case

	| case_stmt_specification

	| sp_labeled_control

	| sp_proc_stmt_unlabeled

	| sp_proc_stmt_leave
@@ -2523,14 +2521,6 @@ sp_proc_stmt_return: 
	  }

        ;



sp_proc_stmt_case_simple:

	CASE_SYM WHEN_SYM

        ;

        

sp_proc_stmt_case:

          CASE_SYM

        ;



sp_proc_stmt_unlabeled:

	  { /* Unlabeled controls get a secret label. */

	    LEX *lex= Lex;