summaryrefslogtreecommitdiff
path: root/sql/sql_yacc.yy
diff options
context:
space:
mode:
authormonty@mysql.com <>2004-05-05 21:24:21 +0300
committermonty@mysql.com <>2004-05-05 21:24:21 +0300
commita5d8b846fafdfe723b046cd7695763f4344254c1 (patch)
tree7237dcd91649e057a85eb3caca141f3df5892db8 /sql/sql_yacc.yy
parentd21d49a32a1689d2c486a449574e120d7a2f60c4 (diff)
downloadmariadb-git-a5d8b846fafdfe723b046cd7695763f4344254c1.tar.gz
after merge fixes
Diffstat (limited to 'sql/sql_yacc.yy')
-rw-r--r--sql/sql_yacc.yy9
1 files changed, 7 insertions, 2 deletions
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