diff options
| author | Mattias Jonsson <mattias.jonsson@sun.com> | 2009-01-07 23:28:49 +0100 |
|---|---|---|
| committer | Mattias Jonsson <mattias.jonsson@sun.com> | 2009-01-07 23:28:49 +0100 |
| commit | f1731568e66763e1d1786d5da517825aaf54187a (patch) | |
| tree | bd3d6f9e69e63db766fe5bff5fab55ad9f81fff3 /sql | |
| parent | 9b1a87287f829094cec9b17a1401279779893d12 (diff) | |
| parent | f257aac8148626c81fb3447eeb2bb85d9756735e (diff) | |
| download | mariadb-git-f1731568e66763e1d1786d5da517825aaf54187a.tar.gz | |
merge
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_partition.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_partition.cc b/sql/sql_partition.cc index e96d9c11a84..ad24aa3c283 100644 --- a/sql/sql_partition.cc +++ b/sql/sql_partition.cc @@ -6760,7 +6760,7 @@ int get_part_iter_for_interval_via_mapping(partition_info *part_info, store_key_image_to_rec(field, max_value, field_len); bool include_endp= !test(flags & NEAR_MAX); part_iter->part_nums.end= get_endpoint(part_info, 0, include_endp); - if (part_iter->part_nums.start == part_iter->part_nums.end && + if (part_iter->part_nums.start >= part_iter->part_nums.end && !part_iter->ret_null_part) return 0; /* No partitions */ } @@ -6938,7 +6938,7 @@ int get_part_iter_for_interval_via_walking(partition_info *part_info, uint32 get_next_partition_id_range(PARTITION_ITERATOR* part_iter) { - if (part_iter->part_nums.cur == part_iter->part_nums.end) + if (part_iter->part_nums.cur >= part_iter->part_nums.end) { part_iter->part_nums.cur= part_iter->part_nums.start; return NOT_A_PARTITION_ID; |