From a5d8b846fafdfe723b046cd7695763f4344254c1 Mon Sep 17 00:00:00 2001
From: "monty@mysql.com" <>
Date: Wed, 5 May 2004 21:24:21 +0300
Subject: after merge fixes

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

(limited to 'sql/sql_yacc.yy')

diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index 86b4702d314..39a2e980094 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -603,7 +603,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b,int *yystacksize);
 
 %type <simple_string>
 	remember_name remember_end opt_ident opt_db text_or_password
-	opt_escape opt_constraint
+	opt_escape opt_constraint constraint
 
 %type <string>
 	text_string opt_gconcat_separator
@@ -1229,7 +1229,12 @@ check_constraint:
 
 opt_constraint:
 	/* empty */		{ $$=(char*) 0; }
-	| CONSTRAINT opt_ident	{ $$=$2; };
+	| constraint		{ $$= $1; }
+	;
+
+constraint:
+	CONSTRAINT opt_ident	{ $$=$2; }
+	;
 
 field_spec:
 	field_ident
-- 
cgit v1.2.1