diff options
| author | Monty <monty@mariadb.org> | 2018-02-19 11:23:20 +0200 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2018-02-19 11:23:20 +0200 |
| commit | 2ba0785ae6b692feefe97c81aa06427724ce197b (patch) | |
| tree | c2d3203c38442f167831b5d326ea09bcc9269089 /sql/sql_alter.h | |
| parent | 778f76a2c6898a45a6c89799ddaad6650ffd0a47 (diff) | |
| download | mariadb-git-10.3-alter.tar.gz | |
Move alter partition flags to alter_info->partition_flags10.3-alter
This is done to get more free flag bits for alter_info->flags
Renamed all ALTER PARTITION defines to start with ALTER_PARTITION_
Renamed ALTER_PARTITION to ALTER_PARTITION_INFO
Renamed ALTER_TABLE_REORG to ALTER_PARTITION_TABLE_REORG
Other things:
- Shifted some ALTER_xxx defines to get empty bits at end
Diffstat (limited to 'sql/sql_alter.h')
| -rw-r--r-- | sql/sql_alter.h | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/sql/sql_alter.h b/sql/sql_alter.h index 3245e4b195c..2f1212ecb53 100644 --- a/sql/sql_alter.h +++ b/sql/sql_alter.h @@ -43,14 +43,14 @@ public: bool partition_modifying() const { - return flags & ( - ALTER_DROP_PARTITION | - ALTER_COALESCE_PARTITION | - ALTER_REORGANIZE_PARTITION | - ALTER_REMOVE_PARTITIONING | - ALTER_TABLE_REORG | - ALTER_EXCHANGE_PARTITION | - ALTER_TRUNCATE_PARTITION); + return partition_flags & ( + ALTER_PARTITION_DROP | + ALTER_PARTITION_COALESCE | + ALTER_PARTITION_REORGANIZE | + ALTER_PARTITION_REMOVE | + ALTER_PARTITION_TABLE_REORG | + ALTER_PARTITION_EXCHANGE | + ALTER_PARTITION_TRUNCATE); } /** @@ -106,6 +106,7 @@ public: List<Virtual_column_info> check_constraint_list; // Type of ALTER TABLE operation. alter_table_operations flags; + ulong partition_flags; // Enable or disable keys. enum_enable_or_disable keys_onoff; // List of partitions. @@ -119,7 +120,7 @@ public: Alter_info() : - flags(0), + flags(0), partition_flags(0), keys_onoff(LEAVE_AS_IS), num_parts(0), requested_algorithm(ALTER_TABLE_ALGORITHM_DEFAULT), @@ -134,6 +135,7 @@ public: create_list.empty(); check_constraint_list.empty(); flags= 0; + partition_flags= 0; keys_onoff= LEAVE_AS_IS; num_parts= 0; partition_names.empty(); |