summaryrefslogtreecommitdiff
path: root/sql/sql_alter.h
diff options
context:
space:
mode:
authorAleksey Midenkov <midenok@gmail.com>2017-11-24 19:15:10 +0300
committerAleksey Midenkov <midenok@gmail.com>2017-11-27 15:07:34 +0300
commit0c571f8c4ee6235327253d5eba58a63f03f12627 (patch)
treebe90ced82d1a7fef07fc1c3427dc983d9fcdb03b /sql/sql_alter.h
parent7320c683b961e59902d0953ceeed4e941dd85aeb (diff)
downloadmariadb-git-0c571f8c4ee6235327253d5eba58a63f03f12627.tar.gz
SQL: versioning_alter_history ERROR mode [closes #350]
Disabled DROP and SURVIVE modes.
Diffstat (limited to 'sql/sql_alter.h')
-rw-r--r--sql/sql_alter.h13
1 files changed, 9 insertions, 4 deletions
diff --git a/sql/sql_alter.h b/sql/sql_alter.h
index 39458c45b80..5c651b0c91b 100644
--- a/sql/sql_alter.h
+++ b/sql/sql_alter.h
@@ -100,20 +100,25 @@ public:
enum enum_enable_or_disable { LEAVE_AS_IS, ENABLE, DISABLE };
- bool vers_data_modifying() const
+ bool data_modifying() const
{
return flags & (
ALTER_ADD_COLUMN |
ALTER_DROP_COLUMN |
ALTER_CHANGE_COLUMN |
+ ALTER_COLUMN_ORDER);
+ }
+
+ bool partition_modifying() const
+ {
+ return flags & (
ALTER_DROP_PARTITION |
ALTER_COALESCE_PARTITION |
ALTER_REORGANIZE_PARTITION |
- ALTER_TABLE_REORG |
ALTER_REMOVE_PARTITIONING |
+ ALTER_TABLE_REORG |
ALTER_EXCHANGE_PARTITION |
- ALTER_TRUNCATE_PARTITION |
- ALTER_COLUMN_ORDER);
+ ALTER_TRUNCATE_PARTITION);
}
/**