diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2020-01-25 16:10:48 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2020-01-25 16:10:48 +0100 |
| commit | 70815ed5b9edbb26795589bc4d8d29b500350302 (patch) | |
| tree | e4dfb5ef8729a54ba226c6cc8ebb952fa9c9d79a /sql/opt_range.cc | |
| parent | fdb9b05cbba648fdc411afb3e39495f37321f084 (diff) | |
| parent | 7e8a58020bc2b0dcac95937a0178401ecc55f6ad (diff) | |
| download | mariadb-git-70815ed5b9edbb26795589bc4d8d29b500350302.tar.gz | |
Merge branch '10.3' into 10.4
Diffstat (limited to 'sql/opt_range.cc')
| -rw-r--r-- | sql/opt_range.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/opt_range.cc b/sql/opt_range.cc index c47da283e9c..c3b82827291 100644 --- a/sql/opt_range.cc +++ b/sql/opt_range.cc @@ -9654,6 +9654,8 @@ and_all_keys(RANGE_OPT_PARAM *param, SEL_ARG *key1, SEL_ARG *key2, } if (key1->type == SEL_ARG::MAYBE_KEY) { + if (key2->type == SEL_ARG::KEY_RANGE) + return key2; key1->right= key1->left= &null_element; key1->next= key1->prev= 0; } |