diff options
author | Alexey Botchkov <holyfoot@askmonty.org> | 2017-02-26 23:01:23 +0400 |
---|---|---|
committer | Alexey Botchkov <holyfoot@askmonty.org> | 2017-02-26 23:01:23 +0400 |
commit | fdeeab01c0b48b5f56e543b98decb76cb58bedbe (patch) | |
tree | 67cf19b9ed36fc2dc8ffd95dd29fa7b8e25af189 /sql/sql_yacc.yy | |
parent | ae142c21a5f7d17cb98f18434b397cb0190725ef (diff) | |
download | mariadb-git-fdeeab01c0b48b5f56e543b98decb76cb58bedbe.tar.gz |
MDEV-6390 CONVERT TO CHARACTER SET utf8 doesn't change DEFAULT CHARSET.
ALTER_CONVERT flag removed and replaced for ALTER_OPTIONS
for the CONVERT TO CHARACTER SET command.
Diffstat (limited to 'sql/sql_yacc.yy')
-rw-r--r-- | sql/sql_yacc.yy | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index aca579f0a98..9885cd729b4 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -7643,7 +7643,7 @@ alter_list_item: LEX *lex= Lex; if (lex->create_info.add_alter_list_item_convert_to_charset($5)) MYSQL_YYABORT; - lex->alter_info.flags|= Alter_info::ALTER_CONVERT; + lex->alter_info.flags|= Alter_info::ALTER_OPTIONS; } | create_table_options_space_separated { |