summaryrefslogtreecommitdiff
path: root/sql/ha_partition.cc
diff options
context:
space:
mode:
authorAlexey Botchkov <holyfoot@mysql.com>2010-10-15 20:13:35 +0500
committerAlexey Botchkov <holyfoot@mysql.com>2010-10-15 20:13:35 +0500
commit8760cec601f6925d6141c6474fbed87c85c693f7 (patch)
treea1092d19baf131d3a71bb50f527840460e51f93b /sql/ha_partition.cc
parent2234783085de0865192c5a30af89cb20643c6322 (diff)
parent6d14cae604d064ec5cd8141bfd05408cc41bf134 (diff)
downloadmariadb-git-8760cec601f6925d6141c6474fbed87c85c693f7.tar.gz
merging.
Diffstat (limited to 'sql/ha_partition.cc')
-rw-r--r--sql/ha_partition.cc8
1 files changed, 6 insertions, 2 deletions
diff --git a/sql/ha_partition.cc b/sql/ha_partition.cc
index d94dc263b48..155d457de6b 100644
--- a/sql/ha_partition.cc
+++ b/sql/ha_partition.cc
@@ -4266,8 +4266,12 @@ int ha_partition::index_read_idx_map(uchar *buf, uint index,
get_partition_set(table, buf, index, &m_start_key, &m_part_spec);
- /* How can it be more than one partition with the current use? */
- DBUG_ASSERT(m_part_spec.start_part == m_part_spec.end_part);
+ /*
+ We have either found exactly 1 partition
+ (in which case start_part == end_part)
+ or no matching partitions (start_part > end_part)
+ */
+ DBUG_ASSERT(m_part_spec.start_part >= m_part_spec.end_part);
for (part= m_part_spec.start_part; part <= m_part_spec.end_part; part++)
{