From 552d4cede57926ecfba91624e9ef2a72cf1bd81f Mon Sep 17 00:00:00 2001
From: unknown <malff/marcsql@weblab.(none)>
Date: Tue, 12 Dec 2006 16:42:35 -0700
Subject: [PATCH] Merge cleanup

---
 sql/sql_yacc.yy | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index a09dfa25e31..bf5369d5553 100644
--- 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
-        | 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;