diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-11-19 10:45:28 +0800 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-11-19 10:45:28 +0800 |
| commit | a9846f329935faba560387bab8fd897102e17385 (patch) | |
| tree | 2734986279de4dbea54be2dda25c994fd99498a8 /sql/ha_partition.cc | |
| parent | 6d373e8b817861d3fd3cb181c02d45d2874d5a27 (diff) | |
| parent | 589a1235b64866c7bbe85da2a6f6bf19ee8282fe (diff) | |
| download | mariadb-git-a9846f329935faba560387bab8fd897102e17385.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'sql/ha_partition.cc')
| -rw-r--r-- | sql/ha_partition.cc | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/sql/ha_partition.cc b/sql/ha_partition.cc index 10d97328c70..005f8e98868 100644 --- a/sql/ha_partition.cc +++ b/sql/ha_partition.cc @@ -5479,6 +5479,13 @@ int ha_partition::index_end() if ((tmp= (*file)->ha_index_end())) error= tmp; } + else if ((*file)->inited == RND) + { + // Possible due to MRR + int tmp; + if ((tmp= (*file)->ha_rnd_end())) + error= tmp; + } } while (*(++file)); destroy_record_priority_queue(); DBUG_RETURN(error); @@ -6513,8 +6520,11 @@ int ha_partition::multi_range_read_next(range_id_t *range_info) else if (unlikely((error= handle_unordered_next(table->record[0], FALSE)))) DBUG_RETURN(error); - *range_info= - ((PARTITION_KEY_MULTI_RANGE *) m_range_info[m_last_part])->ptr; + if (!(m_mrr_mode & HA_MRR_NO_ASSOCIATION)) + { + *range_info= + ((PARTITION_KEY_MULTI_RANGE *) m_range_info[m_last_part])->ptr; + } } DBUG_RETURN(0); } |