mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
Move alter partition flags to alter_info->partition_flags
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
This commit is contained in:
@ -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;
|
||||
|
Reference in New Issue
Block a user