summaryrefslogtreecommitdiff
path: root/sql/ha_partition.h
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2020-08-26 11:30:20 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2020-08-26 11:30:20 +0300
commit1e08e08ccb8896c1f0d2f673c16f5b92cdf7dc46 (patch)
tree2bcef1f1398c85a665743208ec0a856f884b6a84 /sql/ha_partition.h
parent88e70f4caea34e0d7677b1fa646151b8b87dd3ab (diff)
parent6a042281bdbfe91cc39e1f6e02295bfe7eaa9d43 (diff)
downloadmariadb-git-1e08e08ccb8896c1f0d2f673c16f5b92cdf7dc46.tar.gz
Merge 10.3 into 10.4
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 6c9ce40d224..7d10dc19683 100644
--- a/sql/ha_partition.h
+++ b/sql/ha_partition.h
@@ -1620,9 +1620,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;