diff options
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/spider/ha_spider.cc | 34 | ||||
| -rw-r--r-- | storage/spider/spd_include.h | 24 |
2 files changed, 30 insertions, 28 deletions
diff --git a/storage/spider/ha_spider.cc b/storage/spider/ha_spider.cc index 393c33845f3..b1d50391a08 100644 --- a/storage/spider/ha_spider.cc +++ b/storage/spider/ha_spider.cc @@ -11263,13 +11263,13 @@ int ha_spider::create( trx->tmp_flg = TRUE; DBUG_PRINT("info", - ("spider alter_info.flags: %llu", thd->lex->alter_info.flags)); - if ( - (thd->lex->alter_info.flags & + ("spider alter_info.flags: %llu alter_info.partition_flags: %lu", + thd->lex->alter_info.flags, thd->lex->alter_info.partition_flags)); + if ((thd->lex->alter_info.partition_flags & ( - SPIDER_ALTER_ADD_PARTITION | SPIDER_ALTER_DROP_PARTITION | - SPIDER_ALTER_COALESCE_PARTITION | SPIDER_ALTER_REORGANIZE_PARTITION | - SPIDER_ALTER_TABLE_REORG | SPIDER_ALTER_REBUILD_PARTITION + SPIDER_ALTER_PARTITION_ADD | SPIDER_ALTER_PARTITION_DROP | + SPIDER_ALTER_PARTITION_COALESCE | SPIDER_ALTER_PARTITION_REORGANIZE | + SPIDER_ALTER_PARTITION_TABLE_REORG | SPIDER_ALTER_PARTITION_REBUILD ) ) && memcmp(name + strlen(name) - 5, "#TMP#", 5) @@ -11459,13 +11459,14 @@ int ha_spider::rename_table( } DBUG_PRINT("info", - ("spider alter_info.flags: %llu", thd->lex->alter_info.flags)); + ("spider alter_info.flags: %llu alter_info.partition_flags: %lu", + thd->lex->alter_info.flags, thd->lex->alter_info.partition_flags)); if ( - (thd->lex->alter_info.flags & + (thd->lex->alter_info.partition_flags & ( - SPIDER_ALTER_ADD_PARTITION | SPIDER_ALTER_DROP_PARTITION | - SPIDER_ALTER_COALESCE_PARTITION | SPIDER_ALTER_REORGANIZE_PARTITION | - SPIDER_ALTER_TABLE_REORG | SPIDER_ALTER_REBUILD_PARTITION + SPIDER_ALTER_PARTITION_ADD | SPIDER_ALTER_PARTITION_DROP | + SPIDER_ALTER_PARTITION_COALESCE | SPIDER_ALTER_PARTITION_REORGANIZE | + SPIDER_ALTER_PARTITION_TABLE_REORG | SPIDER_ALTER_PARTITION_REBUILD ) ) ) @@ -11654,14 +11655,15 @@ int ha_spider::delete_table( DBUG_RETURN(0); DBUG_PRINT("info", - ("spider alter_info.flags: %llu", thd->lex->alter_info.flags)); + ("spider alter_info.flags: %llu alter_info.partition_flags: %lu", + thd->lex->alter_info.flags, thd->lex->alter_info.partition_flags)); if ( sql_command == SQLCOM_ALTER_TABLE && - (thd->lex->alter_info.flags & + (thd->lex->alter_info.partition_flags & ( - SPIDER_ALTER_ADD_PARTITION | SPIDER_ALTER_DROP_PARTITION | - SPIDER_ALTER_COALESCE_PARTITION | SPIDER_ALTER_REORGANIZE_PARTITION | - SPIDER_ALTER_TABLE_REORG | SPIDER_ALTER_REBUILD_PARTITION + SPIDER_ALTER_PARTITION_ADD | SPIDER_ALTER_PARTITION_DROP | + SPIDER_ALTER_PARTITION_COALESCE | SPIDER_ALTER_PARTITION_REORGANIZE | + SPIDER_ALTER_PARTITION_TABLE_REORG | SPIDER_ALTER_PARTITION_REBUILD ) ) ) diff --git a/storage/spider/spd_include.h b/storage/spider/spd_include.h index 96d75b84ada..ca32facfa5d 100644 --- a/storage/spider/spd_include.h +++ b/storage/spider/spd_include.h @@ -74,12 +74,12 @@ #define spider_user_defined_key_parts(A) (A)->user_defined_key_parts #define spider_join_table_count(A) (A)->table_count #define SPIDER_CAN_BG_UPDATE (1LL << 39) -#define SPIDER_ALTER_ADD_PARTITION ALTER_ADD_PARTITION -#define SPIDER_ALTER_DROP_PARTITION ALTER_DROP_PARTITION -#define SPIDER_ALTER_COALESCE_PARTITION ALTER_COALESCE_PARTITION -#define SPIDER_ALTER_REORGANIZE_PARTITION ALTER_REORGANIZE_PARTITION -#define SPIDER_ALTER_TABLE_REORG ALTER_TABLE_REORG -#define SPIDER_ALTER_REBUILD_PARTITION ALTER_REBUILD_PARTITION +#define SPIDER_ALTER_PARTITION_ADD ALTER_PARTITION_ADD +#define SPIDER_ALTER_PARTITION_DROP ALTER_PARTITION_DROP +#define SPIDER_ALTER_PARTITION_COALESCE ALTER_PARTITION_COALESCE +#define SPIDER_ALTER_PARTITION_REORGANIZE ALTER_PARTITION_REORGANIZE +#define SPIDER_ALTER_PARTITION_TABLE_REORG ALTER_PARTITION_TABLE_REORG +#define SPIDER_ALTER_PARTITION_REBUILD ALTER_PARTITION_REBUILD #define SPIDER_WARN_LEVEL_WARN Sql_condition::WARN_LEVEL_WARN #define SPIDER_WARN_LEVEL_NOTE Sql_condition::WARN_LEVEL_NOTE #define SPIDER_THD_KILL_CONNECTION KILL_CONNECTION @@ -98,12 +98,12 @@ #endif #define spider_user_defined_key_parts(A) (A)->key_parts #define spider_join_table_count(A) (A)->tables -#define SPIDER_ALTER_ADD_PARTITION ALTER_ADD_PARTITION -#define SPIDER_ALTER_DROP_PARTITION ALTER_DROP_PARTITION -#define SPIDER_ALTER_COALESCE_PARTITION ALTER_COALESCE_PARTITION -#define SPIDER_ALTER_REORGANIZE_PARTITION ALTER_REORGANIZE_PARTITION -#define SPIDER_ALTER_TABLE_REORG ALTER_TABLE_REORG -#define SPIDER_ALTER_REBUILD_PARTITION ALTER_REBUILD_PARTITION +#define SPIDER_ALTER_PARTITION_ADD ALTER_PARTITION_ADD +#define SPIDER_ALTER_PARTITION_DROP ALTER_PARTITION_DROP +#define SPIDER_ALTER_PARTITION_COALESCE ALTER_PARTITION_COALESCE +#define SPIDER_ALTER_PARTITION_REORGANIZE ALTER_PARTITION_REORGANIZE +#define SPIDER_ALTER_PARTITION_TABLE_REORG ALTER_PARTITION_TABLE_REORG +#define SPIDER_ALTER_PARTITION_REBUILD ALTER_PARTITION_REBUILD #define SPIDER_WARN_LEVEL_WARN MYSQL_ERROR::WARN_LEVEL_WARN #define SPIDER_WARN_LEVEL_NOTE MYSQL_ERROR::WARN_LEVEL_NOTE #define SPIDER_THD_KILL_CONNECTION THD::KILL_CONNECTION |