From a3d2d2c4cb88761b5ed9496fcac1a4cb25a7b0e6 Mon Sep 17 00:00:00 2001 From: Aleksey Midenkov Date: Tue, 3 Mar 2020 13:50:33 +0300 Subject: [PATCH] MDEV-21747 needless alter_ctx arg in prep_alter_part_table() --- sql/sql_partition.cc | 5 ++--- sql/sql_partition.h | 1 - sql/sql_table.cc | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/sql/sql_partition.cc b/sql/sql_partition.cc index 5885e3715bf..d9de6e95b89 100644 --- a/sql/sql_partition.cc +++ b/sql/sql_partition.cc @@ -4805,7 +4805,6 @@ static void check_datadir_altered_for_innodb(THD *thd, uint prep_alter_part_table(THD *thd, TABLE *table, Alter_info *alter_info, HA_CREATE_INFO *create_info, - Alter_table_ctx *alter_ctx, bool *partition_changed, bool *fast_alter_table) { @@ -4900,8 +4899,8 @@ uint prep_alter_part_table(THD *thd, TABLE *table, Alter_info *alter_info, object to allow fast_alter_partition_table to perform the changes. */ DBUG_ASSERT(thd->mdl_context.is_lock_owner(MDL_key::TABLE, - alter_ctx->db.str, - alter_ctx->table_name.str, + table->s->db.str, + table->s->table_name.str, MDL_INTENTION_EXCLUSIVE)); tab_part_info= table->part_info; diff --git a/sql/sql_partition.h b/sql/sql_partition.h index 8732aacbbd7..58ba82dcd9f 100644 --- a/sql/sql_partition.h +++ b/sql/sql_partition.h @@ -262,7 +262,6 @@ bool set_part_state(Alter_info *alter_info, partition_info *tab_part_info, enum partition_state part_state); uint prep_alter_part_table(THD *thd, TABLE *table, Alter_info *alter_info, HA_CREATE_INFO *create_info, - Alter_table_ctx *alter_ctx, bool *partition_changed, bool *fast_alter_table); char *generate_partition_syntax(THD *thd, partition_info *part_info, diff --git a/sql/sql_table.cc b/sql/sql_table.cc index 3b56a721801..e64fddad4c0 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -9892,8 +9892,7 @@ do_continue:; bool fast_alter_partition= false; { if (prep_alter_part_table(thd, table, alter_info, create_info, - &alter_ctx, &partition_changed, - &fast_alter_partition)) + &partition_changed, &fast_alter_partition)) { DBUG_RETURN(true); }