diff options
| author | Alexey Botchkov <holyfoot@askmonty.org> | 2019-02-03 21:23:35 +0400 |
|---|---|---|
| committer | Alexey Botchkov <holyfoot@askmonty.org> | 2019-02-03 21:23:35 +0400 |
| commit | a45cf051251a461a8f2e62a7ba0510dc5cbfe523 (patch) | |
| tree | f91c534211fcfcda1e6bdce96565fd5c0f8f0525 | |
| parent | f82b0c969269f9732794610f714e91a972d4fb87 (diff) | |
| download | mariadb-git-bb-14005-hf.tar.gz | |
MODIFY idx_read_mapbb-14005-hf
| -rw-r--r-- | sql/ha_partition.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sql/ha_partition.cc b/sql/ha_partition.cc index 8e1165c14af..d1804e47fe3 100644 --- a/sql/ha_partition.cc +++ b/sql/ha_partition.cc @@ -4229,14 +4229,12 @@ int ha_partition::check_files_for_key(uchar *key, int n_key, f->ha_end_keyread(); - /* if (sav_inited == RND) { int ires= f->ha_rnd_init(FALSE); if (ires) *res= ires; } - */ if (*res == HA_ERR_KEY_NOT_FOUND) continue; @@ -5949,8 +5947,8 @@ int ha_partition::index_read_idx_map(uchar *buf, uint index, (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 || - m_part_info->n_uniques_to_check); + DBUG_ASSERT(m_part_spec.start_part >= m_part_spec.end_part/* || + m_part_info->n_uniques_to_check*/); /* The start part is must be marked as used. */ DBUG_ASSERT(m_part_spec.start_part > m_part_spec.end_part || bitmap_is_set(&(m_part_info->read_partitions), |