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_admin.cc | |
| 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_admin.cc')
| -rw-r--r-- | sql/sql_admin.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sql/sql_admin.cc b/sql/sql_admin.cc index 65f1f2d6627..82fc1cbfff7 100644 --- a/sql/sql_admin.cc +++ b/sql/sql_admin.cc @@ -339,7 +339,7 @@ static bool open_only_one_table(THD* thd, TABLE_LIST* table, to differentiate from ALTER TABLE...CHECK PARTITION on which view is not allowed. */ - if (lex->alter_info.flags & ALTER_ADMIN_PARTITION || + if (lex->alter_info.partition_flags & ALTER_PARTITION_ADMIN || !is_view_operator_func) { table->required_type= TABLE_TYPE_NORMAL; @@ -562,7 +562,7 @@ static bool mysql_admin_table(THD* thd, TABLE_LIST* tables, */ Alter_info *alter_info= &lex->alter_info; - if (alter_info->flags & ALTER_ADMIN_PARTITION) + if (alter_info->partition_flags & ALTER_PARTITION_ADMIN) { if (!table->table->part_info) { @@ -1002,7 +1002,7 @@ send_result_message: Alter_info *alter_info= &lex->alter_info; protocol->store(STRING_WITH_LEN("note"), system_charset_info); - if (alter_info->flags & ALTER_ADMIN_PARTITION) + if (alter_info->partition_flags & ALTER_PARTITION_ADMIN) { protocol->store(STRING_WITH_LEN( "Table does not support optimize on partitions. All partitions " @@ -1046,10 +1046,10 @@ send_result_message: save_flags= alter_info->flags; /* - Reset the ALTER_ADMIN_PARTITION bit in alter_info->flags + Reset the ALTER_PARTITION_ADMIN bit in alter_info->flags to force analyze on all partitions. */ - alter_info->flags &= ~(ALTER_ADMIN_PARTITION); + alter_info->partition_flags &= ~(ALTER_PARTITION_ADMIN); result_code= table->table->file->ha_analyze(thd, check_opt); if (result_code == HA_ADMIN_ALREADY_DONE) result_code= HA_ADMIN_OK; |