mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 12:32:27 +01:00
Fix for BUG#8578 "Test case 'index_merge_ror' fails on SGI irix"
Take into account that bitmap_is_set() may return any non-zero zero value when the bit is set.
This commit is contained in:
parent
17cca96ec9
commit
db895ce720
1 changed files with 3 additions and 2 deletions
|
@ -2562,7 +2562,7 @@ static double ror_scan_selectivity(const ROR_INTERSECT_INFO *info,
|
|||
char *key_ptr= (char*) key_val;
|
||||
SEL_ARG *sel_arg, *tuple_arg= NULL;
|
||||
bool cur_covered;
|
||||
bool prev_covered= bitmap_is_set(&info->covered_fields, key_part->fieldnr);
|
||||
bool prev_covered= (bitmap_is_set(&info->covered_fields, key_part->fieldnr))? 1:0;
|
||||
key_range min_range;
|
||||
key_range max_range;
|
||||
min_range.key= (byte*) key_val;
|
||||
|
@ -2575,7 +2575,8 @@ static double ror_scan_selectivity(const ROR_INTERSECT_INFO *info,
|
|||
for(i= 0, sel_arg= scan->sel_arg; sel_arg;
|
||||
i++, sel_arg= sel_arg->next_key_part)
|
||||
{
|
||||
cur_covered= bitmap_is_set(&info->covered_fields, (key_part + i)->fieldnr);
|
||||
DBUG_PRINT("info",("sel_arg step"));
|
||||
cur_covered= (bitmap_is_set(&info->covered_fields, (key_part + i)->fieldnr))? 1:0;
|
||||
if (cur_covered != prev_covered)
|
||||
{
|
||||
/* create (part1val, ..., part{n-1}val) tuple. */
|
||||
|
|
Loading…
Reference in a new issue