database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge branch '10.3' into 10.4

Browse Source
This commit is contained in:
Oleksandr Byelkin
2020-01-25 16:10:48 +01:00
parent fdb9b05cbb 7e8a58020b
commit 70815ed5b9
4 changed files with 194 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/opt_range.cc
View File

@ -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;
}