1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-21747 needless alter_ctx arg in prep_alter_part_table()

Browse Source
This commit is contained in:
Aleksey Midenkov 2020-03-03 13:50:33 +03:00
parent 193725b81e
commit a3d2d2c4cb
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sql/sql_partition.cc
View File

@ -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, uint prep_alter_part_table(THD *thd, TABLE *table, Alter_info *alter_info,
HA_CREATE_INFO *create_info, HA_CREATE_INFO *create_info,
Alter_table_ctx *alter_ctx,
bool *partition_changed, bool *partition_changed,
bool *fast_alter_table) 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. object to allow fast_alter_partition_table to perform the changes.
*/ */
DBUG_ASSERT(thd->mdl_context.is_lock_owner(MDL_key::TABLE, DBUG_ASSERT(thd->mdl_context.is_lock_owner(MDL_key::TABLE,
alter_ctx->db.str, table->s->db.str,
alter_ctx->table_name.str, table->s->table_name.str,
MDL_INTENTION_EXCLUSIVE)); MDL_INTENTION_EXCLUSIVE));
tab_part_info= table->part_info; tab_part_info= table->part_info;

1
sql/sql_partition.h
View File

@ -262,7 +262,6 @@ bool set_part_state(Alter_info *alter_info, partition_info *tab_part_info,
enum partition_state part_state); enum partition_state part_state);
uint prep_alter_part_table(THD *thd, TABLE *table, Alter_info *alter_info, uint prep_alter_part_table(THD *thd, TABLE *table, Alter_info *alter_info,
HA_CREATE_INFO *create_info, HA_CREATE_INFO *create_info,
Alter_table_ctx *alter_ctx,
bool *partition_changed, bool *partition_changed,
bool *fast_alter_table); bool *fast_alter_table);
char *generate_partition_syntax(THD *thd, partition_info *part_info, char *generate_partition_syntax(THD *thd, partition_info *part_info,

3
sql/sql_table.cc
View File

@ -9892,8 +9892,7 @@ do_continue:;
bool fast_alter_partition= false; bool fast_alter_partition= false;
{ {
if (prep_alter_part_table(thd, table, alter_info, create_info, if (prep_alter_part_table(thd, table, alter_info, create_info,
&alter_ctx, &partition_changed, &partition_changed, &fast_alter_partition))
&fast_alter_partition))
{ {
DBUG_RETURN(true); DBUG_RETURN(true);
} }