diff options
| author | Alexey Botchkov <holyfoot@mysql.com> | 2010-10-15 20:13:35 +0500 |
|---|---|---|
| committer | Alexey Botchkov <holyfoot@mysql.com> | 2010-10-15 20:13:35 +0500 |
| commit | 9de94cd5011477405ea83e87a6330e05dcf9d707 (patch) | |
| tree | a1092d19baf131d3a71bb50f527840460e51f93b /sql | |
| parent | 1d20a70674820c97c2b332548514d6a027cf4f1e (diff) | |
| parent | 333c7598efc028fc8fca8ad0336fdffbb5705ae0 (diff) | |
| download | mariadb-git-9de94cd5011477405ea83e87a6330e05dcf9d707.tar.gz | |
merging.
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/ha_partition.cc | 8 |
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++) { |