diff options
| author | unknown <bar@bar.mysql.r18.ru> | 2003-01-08 13:38:11 +0400 |
|---|---|---|
| committer | unknown <bar@bar.mysql.r18.ru> | 2003-01-08 13:38:11 +0400 |
| commit | 9d242d16801bfa982d5b548fdcc1490d338fb344 (patch) | |
| tree | a972c8a812fe408235c0e159bcf7f92c44d222dc | |
| parent | d27b8eb7a7c0a2917589180e17335f40ae98b141 (diff) | |
| download | mariadb-git-9d242d16801bfa982d5b548fdcc1490d338fb344.tar.gz | |
COLLATE is field attribute not field type
| -rw-r--r-- | sql/sql_yacc.yy | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index bcee15c13cf..587538fe0e2 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -1231,7 +1231,8 @@ attribute: | opt_primary KEY_SYM { Lex->type|= PRI_KEY_FLAG | NOT_NULL_FLAG; } | UNIQUE_SYM { Lex->type|= UNIQUE_FLAG; } | UNIQUE_SYM KEY_SYM { Lex->type|= UNIQUE_KEY_FLAG; } - | COMMENT_SYM text_literal { Lex->comment= $2; }; + | COMMENT_SYM text_literal { Lex->comment= $2; } + | COLLATE_SYM charset_name { Lex->charset=$2; }; charset_name: @@ -1278,7 +1279,6 @@ opt_binary: YYABORT; } } - | COLLATE_SYM charset_name { Lex->charset=$2; } | CHAR_SYM SET charset_name { Lex->charset=$3; } ; opt_primary: |