Skip to content

M
mariadb
Commit f94cc9b6 authored by unknown's avatar unknown
Browse files
Options

Merge abarkov@work.mysql.com:/home/bk/mysql-4.1 

into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
parents 544fd657 8ef72be7
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
sql/sql_yacc.yy
View file @ f94cc9b6
...@@ -1231,7 +1231,8 @@ attribute: ...@@ -1231,7 +1231,8 @@ attribute:
| opt_primary KEY_SYM { Lex->type|= PRI_KEY_FLAG | NOT_NULL_FLAG; } | opt_primary KEY_SYM { Lex->type|= PRI_KEY_FLAG | NOT_NULL_FLAG; }
| UNIQUE_SYM { Lex->type|= UNIQUE_FLAG; } | UNIQUE_SYM { Lex->type|= UNIQUE_FLAG; }
| UNIQUE_SYM KEY_SYM { Lex->type|= UNIQUE_KEY_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: charset_name:
...@@ -1278,7 +1279,6 @@ opt_binary: ...@@ -1278,7 +1279,6 @@ opt_binary:
YYABORT; YYABORT;
} }
} }
| COLLATE_SYM charset_name { Lex->charset=$2; }
| CHAR_SYM SET charset_name { Lex->charset=$3; } ; | CHAR_SYM SET charset_name { Lex->charset=$3; } ;
opt_primary: opt_primary:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7