summaryrefslogtreecommitdiff
path: root/sql/sql_partition.cc
diff options
context:
space:
mode:
authorMikael Ronstrom <mikael@mysql.com>2009-10-02 11:31:05 +0200
committerMikael Ronstrom <mikael@mysql.com>2009-10-02 11:31:05 +0200
commit08b57e5387dfed356bc1f254e160c118a2174c2e (patch)
treea4e2432ccecf236709f2735f2cd0fe3782123f72 /sql/sql_partition.cc
parentc9865cdb9085f43b805d7063c4db9f3ba6debe1f (diff)
downloadmariadb-git-08b57e5387dfed356bc1f254e160c118a2174c2e.tar.gz
BUG#47754, used number of parts instead of number of list values as end part for list partitioning in column list partitioning
Diffstat (limited to 'sql/sql_partition.cc')
-rw-r--r--sql/sql_partition.cc10
1 files changed, 9 insertions, 1 deletions
diff --git a/sql/sql_partition.cc b/sql/sql_partition.cc
index 05b3822ce43..898cf8f07cd 100644
--- a/sql/sql_partition.cc
+++ b/sql/sql_partition.cc
@@ -6962,7 +6962,15 @@ int get_part_iter_for_interval_cols_via_map(partition_info *part_info,
nparts);
}
if (flags & NO_MAX_RANGE)
- part_iter->part_nums.end= part_info->num_parts;
+ {
+ if (part_info->part_type == RANGE_PARTITION)
+ part_iter->part_nums.end= part_info->num_parts;
+ else /* LIST_PARTITION */
+ {
+ DBUG_ASSERT(part_info->part_type == LIST_PARTITION);
+ part_iter->part_nums.end= part_info->num_list_values;
+ }
+ }
else
{
// Copy from max_value to record