diff options
| author | Dmitry Shulga <dmitry.shulga@mariadb.com> | 2021-09-05 12:27:40 +0700 |
|---|---|---|
| committer | Dmitry Shulga <dmitry.shulga@mariadb.com> | 2021-09-05 12:27:40 +0700 |
| commit | f9b88abd7d022dd4096e1c354c14a3aef060f5ee (patch) | |
| tree | 6ba20b6cb781be359708d3ad9052f82989e02be1 | |
| parent | 149bebccee35e54fa1de5b35217d41ad2ec662d0 (diff) | |
| download | mariadb-git-bb-10.7-MDEV-22165.tar.gz | |
MDEV-22165: reverted changed in prep_alter_part_tablebb-10.7-MDEV-22165
| -rw-r--r-- | sql/sql_partition.cc | 6 | ||||
| -rw-r--r-- | sql/sql_partition.h | 5 | ||||
| -rw-r--r-- | sql/sql_table.cc | 5 |
3 files changed, 6 insertions, 10 deletions
diff --git a/sql/sql_partition.cc b/sql/sql_partition.cc index f8c5b6d4352..ff316093876 100644 --- a/sql/sql_partition.cc +++ b/sql/sql_partition.cc @@ -4915,13 +4915,11 @@ static bool compare_tables_metadata(ALTER_PARTITION_PARAM_TYPE *lpt) change patterns. */ -uint prep_alter_part_table(THD *thd, TABLE_LIST *tables, Alter_info *alter_info, +uint prep_alter_part_table(THD *thd, TABLE *table, Alter_info *alter_info, HA_CREATE_INFO *create_info, bool *partition_changed, - bool *fast_alter_table, - const Alter_table_ctx &alter_ctx) + bool *fast_alter_table) { - TABLE *table= tables->table; DBUG_ENTER("prep_alter_part_table"); /* Foreign keys on partitioned tables are not supported, waits for WL#148 */ diff --git a/sql/sql_partition.h b/sql/sql_partition.h index f62230dfcdd..1269751674e 100644 --- a/sql/sql_partition.h +++ b/sql/sql_partition.h @@ -264,11 +264,10 @@ uint fast_alter_partition_table(THD *thd, TABLE *table, const LEX_CSTRING *table_name); 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_LIST *tables, Alter_info *alter_info, +uint prep_alter_part_table(THD *thd, TABLE *table, Alter_info *alter_info, HA_CREATE_INFO *create_info, bool *partition_changed, - bool *fast_alter_table, - const Alter_table_ctx &alter_ctx); + bool *fast_alter_table); char *generate_partition_syntax(THD *thd, partition_info *part_info, uint *buf_length, bool show_partition_options, diff --git a/sql/sql_table.cc b/sql/sql_table.cc index 2ecfa512793..3bb65a108e2 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -10078,9 +10078,8 @@ do_continue:; #ifdef WITH_PARTITION_STORAGE_ENGINE { - if (prep_alter_part_table(thd, table_list, alter_info, create_info, - &partition_changed, &fast_alter_partition, - alter_ctx)) + if (prep_alter_part_table(thd, table, alter_info, create_info, + &partition_changed, &fast_alter_partition)) { DBUG_RETURN(true); } |