summaryrefslogtreecommitdiff
path: root/sql/sql_yacc.yy
diff options
context:
space:
mode:
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 fe387ed80f2..412fcce8625 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -1017,7 +1017,7 @@ Virtual_column_info *add_virtual_expression(THD *thd, Item *expr)
bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize);
%}
-%pure_parser /* We have threads */
+%pure-parser /* We have threads */
%parse-param { THD *thd }
%lex-param { THD *thd }
/*
@@ -7748,7 +7748,7 @@ alter_list_item:
$5->name, $4->csname));
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
{