diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-06-02 16:51:13 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-06-02 16:51:13 +0300 |
| commit | 4b3c3e526e7067da921d0aef8451b6e2736a5fe0 (patch) | |
| tree | 40a6d851d7c39c443c587e29a725afda85c65929 /sql/partition_info.cc | |
| parent | e7de50a82187cbaaa192c2065d64c0041cd9a6a1 (diff) | |
| parent | 96f4b4a55b449a29af7e4b70bebf0ff238ae7f80 (diff) | |
| download | mariadb-git-4b3c3e526e7067da921d0aef8451b6e2736a5fe0.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'sql/partition_info.cc')
| -rw-r--r-- | sql/partition_info.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/partition_info.cc b/sql/partition_info.cc index bb511b0020c..959dd674101 100644 --- a/sql/partition_info.cc +++ b/sql/partition_info.cc @@ -884,10 +884,12 @@ void partition_info::vers_check_limit(THD *thd) bitmap_set_all(), but this is not optimal since there can be quite a number of partitions. */ +#ifndef DBUG_OFF const uint32 sub_factor= num_subparts ? num_subparts : 1; uint32 part_id= vers_info->hist_part->id * sub_factor; const uint32 part_id_end= part_id + sub_factor; DBUG_ASSERT(part_id_end <= num_parts * sub_factor); +#endif ha_partition *hp= (ha_partition*)(table->file); ha_rows hist_rows= hp->part_records(vers_info->hist_part); |