summaryrefslogtreecommitdiff
path: root/sql/sql_yacc.yy
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mariadb.org>2018-02-12 10:03:28 +0400
committerAlexander Barkov <bar@mariadb.org>2018-02-12 10:03:28 +0400
commitda99e086f90a4ec5a1188e51f4cc1dfc952ba771 (patch)
tree78fe85a44e55865d8cf7628764d5545f3f5e629b /sql/sql_yacc.yy
parent5559905d4186ce62c9df49d41d0f05c1189fd753 (diff)
parent7a106d19614cb052ecf245e3825b9510e8029ba0 (diff)
downloadmariadb-git-da99e086f90a4ec5a1188e51f4cc1dfc952ba771.tar.gz
Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext
Diffstat (limited to 'sql/sql_yacc.yy')
-rw-r--r--sql/sql_yacc.yy3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index a695d6afd60..90db0cb7ec2 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -7767,7 +7767,8 @@ alter_list_item:
| CHANGE opt_column opt_if_exists_table_element field_ident
field_spec opt_place
{
- Lex->alter_info.flags|= Alter_info::ALTER_CHANGE_COLUMN;
+ Lex->alter_info.flags|= (Alter_info::ALTER_CHANGE_COLUMN |
+ Alter_info::ALTER_RENAME_COLUMN);
Lex->create_last_non_select_table= Lex->last_table();
$5->change= $4;
$5->after= $6;