diff options
| author | unknown <bar@bar.mysql.r18.ru> | 2003-01-08 13:41:03 +0400 |
|---|---|---|
| committer | unknown <bar@bar.mysql.r18.ru> | 2003-01-08 13:41:03 +0400 |
| commit | f94cc9b6e127246ab35bbfde465b2d30b698cff0 (patch) | |
| tree | d9fc7b684236a783753d8a7d3d0579ed1c8b7763 | |
| parent | 544fd6571449549f9244436ff5e9e41cabfe500b (diff) | |
| parent | 8ef72be7aca1dd2fe4ed6658a7e38e2c79ee9ad6 (diff) | |
| download | mariadb-git-f94cc9b6e127246ab35bbfde465b2d30b698cff0.tar.gz | |
Merge abarkov@work.mysql.com:/home/bk/mysql-4.1
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
| -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: |