summaryrefslogtreecommitdiff
path: root/sql/opt_range.cc
diff options
context:
space:
mode:
authorOleksandr Byelkin <sanja@mariadb.com>2020-12-25 09:13:28 +0100
committerOleksandr Byelkin <sanja@mariadb.com>2020-12-25 09:13:28 +0100
commit478b83032b170b2ae030fa77fe4bed60a7910472 (patch)
treea3893bb725e227dc15c6997731cdeba622ae1744 /sql/opt_range.cc
parent0aa02567dd62d96467f84ba96cc67b103f63c9e0 (diff)
parent043bd85a574a88856ab9c6d497e682ed06fe45e9 (diff)
downloadmariadb-git-478b83032b170b2ae030fa77fe4bed60a7910472.tar.gz
Merge branch '10.3' into 10.4bb-10.4-MDEV-23468
Diffstat (limited to 'sql/opt_range.cc')
-rw-r--r--sql/opt_range.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/opt_range.cc b/sql/opt_range.cc
index 1a7ac1044c3..97ebbdbe8a7 100644
--- a/sql/opt_range.cc
+++ b/sql/opt_range.cc
@@ -7800,9 +7800,9 @@ SEL_TREE *Item_func_in::get_func_mm_tree(RANGE_OPT_PARAM *param,
{
key_map::Iterator it(field->key_start);
uint key_no;
- while ((key_no= it.next_bit()) != key_map::Iterator::BITMAP_END)
+ while ((key_no= it++) != key_map::Iterator::BITMAP_END)
{
- KEY *key_info= &param->table->key_info[key_no];
+ KEY *key_info= &field->table->key_info[key_no];
if (key_info->user_defined_key_parts == 1 &&
(key_info->flags & HA_NOSAME))
{