summaryrefslogtreecommitdiff
path: root/sql/sql_yacc.yy
diff options
context:
space:
mode:
authorunknown <bar@bar.mysql.r18.ru>2002-10-25 15:08:47 +0500
committerunknown <bar@bar.mysql.r18.ru>2002-10-25 15:08:47 +0500
commit235068a164404ee055999ef7d5819226d2f20d34 (patch)
treea2644a7fe740f7ff311a1c4c5d3e4bf13cc45070 /sql/sql_yacc.yy
parent0525cf47cb23a02cf6f29bceed0b3e3444a34055 (diff)
downloadmariadb-git-235068a164404ee055999ef7d5819226d2f20d34.tar.gz
ENUM/SET fields now have charset too
Diffstat (limited to 'sql/sql_yacc.yy')
-rw-r--r--sql/sql_yacc.yy4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index e2f97f5a080..83de03026f1 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -1064,13 +1064,13 @@ type:
{ $$=FIELD_TYPE_DECIMAL;}
| NUMERIC_SYM float_options field_options
{ $$=FIELD_TYPE_DECIMAL;}
- | ENUM {Lex->interval_list.empty();} '(' string_list ')'
+ | ENUM {Lex->interval_list.empty();} '(' string_list ')' opt_binary
{
LEX *lex=Lex;
lex->interval=typelib(lex->interval_list);
$$=FIELD_TYPE_ENUM;
}
- | SET { Lex->interval_list.empty();} '(' string_list ')'
+ | SET { Lex->interval_list.empty();} '(' string_list ')' opt_binary
{
LEX *lex=Lex;
lex->interval=typelib(lex->interval_list);