Merge cleanup

c5586269 · malff/marcsql@weblab.(none) · f22dad8b · c5586269
Commit c5586269 authored Dec 12, 2006 by malff/marcsql@weblab.(none)
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 12 deletions

sql/sql_yacc.yy sql/sql_yacc.yy +2 -12

No files found.
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -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
+        | case_stmt_specification
-        | sp_proc_stmt_case
        | 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
+	| case_stmt_specification
-        | sp_proc_stmt_case
 	| 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;