database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0

Browse Source 
into mysql.com:/home/psergey/mysql-5.0-bug15204
This commit is contained in:
sergefp@mysql.com
2005-11-25 20:48:26 +03:00
parent c779c2c809 526a1d89c9
commit e5592190e5
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/opt_range.cc
View File

@ -3136,10 +3136,10 @@ TRP_ROR_INTERSECT *get_best_covering_ror_intersect(PARAM *param,
/* F=F-covered by first(I) */ /* F=F-covered by first(I) */
bitmap_union(&covered_fields, &(*ror_scan_mark)->covered_fields); bitmap_union(&covered_fields, &(*ror_scan_mark)->covered_fields);
all_covered= bitmap_is_subset(&param->needed_fields, &covered_fields); all_covered= bitmap_is_subset(&param->needed_fields, &covered_fields);
} while (!all_covered && (++ror_scan_mark < ror_scans_end)); } while ((++ror_scan_mark < ror_scans_end) && !all_covered);
if (!all_covered) if (!all_covered || (ror_scan_mark - tree->ror_scans) == 1)
DBUG_RETURN(NULL); /* should not happen actually */ DBUG_RETURN(NULL);
/* /*
Ok, [tree->ror_scans .. ror_scan) holds covering index_intersection with Ok, [tree->ror_scans .. ror_scan) holds covering index_intersection with