From 8a6ca78b3601cdcb11f86f2bcddf990f06acedc7 Mon Sep 17 00:00:00 2001 From: yuxianjiang Date: Wed, 5 Jan 2022 10:07:29 +0800 Subject: [PATCH] Fixup alter innodb partition table crash in debug mode. --- sql/sql_partition_admin.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sql/sql_partition_admin.cc b/sql/sql_partition_admin.cc index a86a630..ced9a27 100644 --- a/sql/sql_partition_admin.cc +++ b/sql/sql_partition_admin.cc @@ -213,10 +213,6 @@ static bool compare_table_with_partition(THD *thd, TABLE *table, my_error(ER_TABLES_DIFFERENT_METADATA, MYF(0)); DBUG_RETURN(TRUE); } - DBUG_ASSERT(table->s->db_create_options == - part_table->s->db_create_options); - DBUG_ASSERT(table->s->db_options_in_use == - part_table->s->db_options_in_use); if (table_create_info.avg_row_length != part_create_info.avg_row_length) { @@ -248,6 +244,10 @@ static bool compare_table_with_partition(THD *thd, TABLE *table, if (compare_partition_options(&table_create_info, part_elem)) DBUG_RETURN(TRUE); + DBUG_ASSERT(table->s->db_create_options == + part_table->s->db_create_options); + DBUG_ASSERT(table->s->db_options_in_use == + part_table->s->db_options_in_use); DBUG_RETURN(FALSE); } -- 1.8.3.1