Merge branch '10.2' into 10.3

sanja-byelkin · sanja-byelkin · commit 043bd85a574a · 2020-12-24T22:17:51.000+01:00
diff --git a/sql/opt_range.cc b/sql/opt_range.cc
@@ -7188,7 +7188,7 @@ 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= &field->table->key_info[key_no];
           if (key_info->user_defined_key_parts == 1 &&

Original file line number	Diff line number	Diff line change
`@@ -7188,7 +7188,7 @@ SEL_TREE Item_func_in::get_func_mm_tree(RANGE_OPT_PARAM param,`
`7188`	`7188`	`{`
`7189`	`7189`	`key_map::Iterator it(field->key_start);`
`7190`	`7190`	`uint key_no;`
`7191`		`- while ((key_no= it.next_bit()) != key_map::Iterator::BITMAP_END)`
	`7191`	`+ while ((key_no= it++) != key_map::Iterator::BITMAP_END)`
`7192`	`7192`	`{`
`7193`	`7193`	`KEY *key_info= &field->table->key_info[key_no];`
`7194`	`7194`	`if (key_info->user_defined_key_parts == 1 &&`