mirror of
https://github.com/MariaDB/server.git
synced 2025-08-01 03:47:19 +03:00
manual merge
This commit is contained in:

parent
3dc4635c70
commit
05105a02cc
@ -5157,7 +5157,7 @@ write_log_changed_partitions(ALTER_PARTITION_PARAM_TYPE *lpt,
|
||||
if (part_elem->part_state == PART_IS_CHANGED ||
|
||||
(part_elem->part_state == PART_IS_ADDED && temp_partitions))
|
||||
{
|
||||
if (is_sub_partitioned(part_info))
|
||||
if (part_info->is_sub_partitioned())
|
||||
{
|
||||
List_iterator<partition_element> sub_it(part_elem->subpartitions);
|
||||
uint no_subparts= part_info->no_subparts;
|
||||
@ -5271,7 +5271,7 @@ write_log_dropped_partitions(ALTER_PARTITION_PARAM_TYPE *lpt,
|
||||
name_variant= TEMP_PART_NAME;
|
||||
else
|
||||
name_variant= NORMAL_PART_NAME;
|
||||
if (is_sub_partitioned(part_info))
|
||||
if (part_info->is_sub_partitioned())
|
||||
{
|
||||
List_iterator<partition_element> sub_it(part_elem->subpartitions);
|
||||
uint no_subparts= part_info->no_subparts;
|
||||
|
Reference in New Issue
Block a user