database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-05 13:16:09 +03:00
Code Activity

Merge remote-tracking branch 'origin/10.1' into 10.2

Browse Source
This commit is contained in:
Monty
2018-05-24 18:56:33 +03:00
committed by Vicențiu Ciorbaru
parent 72a8d29e00 bfed1bfe28
commit 494c981d23
40 changed files with 822 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
sql/sql_table.cc
View File

@@ -5888,10 +5888,28 @@ drop_create_field:
List_iterator<Alter_drop> drop_it(alter_info->drop_list);
Alter_drop *drop;
bool remove_drop;
ulonglong left_flags= 0;
while ((drop= drop_it++))
{
ulonglong cur_flag= 0;
switch (drop->type) {
case Alter_drop::COLUMN:
cur_flag= Alter_info::ALTER_DROP_COLUMN;
break;
case Alter_drop::FOREIGN_KEY:
cur_flag= Alter_info::DROP_FOREIGN_KEY;
break;
case Alter_drop::KEY:
cur_flag= Alter_info::ALTER_DROP_INDEX;
break;
default:
break;
}
if (!drop->drop_if_exists)
{
left_flags|= cur_flag;
continue;
}
remove_drop= TRUE;
if (drop->type == Alter_drop::COLUMN)
{
@@ -5980,12 +5998,15 @@ drop_create_field:
ER_THD(thd, ER_CANT_DROP_FIELD_OR_KEY),
drop->type_name(), drop->name);
drop_it.remove();
if (alter_info->drop_list.is_empty())
alter_info->flags&= ~(Alter_info::ALTER_DROP_COLUMN |
Alter_info::ALTER_DROP_INDEX |
Alter_info::DROP_FOREIGN_KEY);
}
else
left_flags|= cur_flag;
}
/* Reset state to what's left in drop list */
alter_info->flags&= ~(Alter_info::ALTER_DROP_COLUMN |
Alter_info::ALTER_DROP_INDEX |
Alter_info::DROP_FOREIGN_KEY);
alter_info->flags|= left_flags;
}
/* ALTER TABLE ADD KEY IF NOT EXISTS */