summaryrefslogtreecommitdiff
path: root/sql/ha_partition.h
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2020-08-26 12:02:07 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2020-08-26 12:02:07 +0300
commit97a4a3872e5037b8db1e8c27152740190330ab9c (patch)
tree4ac50bc687f7f1e55f4d4ff25e8a96555501e2bf /sql/ha_partition.h
parent8f8f2aea93835899345454f87768fd649749e29c (diff)
parent1e08e08ccb8896c1f0d2f673c16f5b92cdf7dc46 (diff)
downloadmariadb-git-97a4a3872e5037b8db1e8c27152740190330ab9c.tar.gz
Merge 10.4 into 10.5
Diffstat (limited to 'sql/ha_partition.h')
-rw-r--r--sql/ha_partition.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/ha_partition.h b/sql/ha_partition.h
index 4556c5f482e..8d0557f4ae4 100644
--- a/sql/ha_partition.h
+++ b/sql/ha_partition.h
@@ -1619,9 +1619,8 @@ public:
return h;
}
- ha_rows part_records(void *_part_elem)
+ ha_rows part_records(partition_element *part_elem)
{
- partition_element *part_elem= reinterpret_cast<partition_element *>(_part_elem);
DBUG_ASSERT(m_part_info);
uint32 sub_factor= m_part_info->num_subparts ? m_part_info->num_subparts : 1;
uint32 part_id= part_elem->id * sub_factor;