mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 13:32:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
into mysql.com:/home/psergey/mysql-5.0-build
This commit is contained in:
unknown 2005-02-22 18:22:39 +03:00
commit 3d9ee100f7
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
sql/opt_range.cc
View file

@ -2562,7 +2562,7 @@ static double ror_scan_selectivity(const ROR_INTERSECT_INFO *info,
char *key_ptr= (char*) key_val; char *key_ptr= (char*) key_val;
SEL_ARG *sel_arg, *tuple_arg= NULL; SEL_ARG *sel_arg, *tuple_arg= NULL;
bool cur_covered; 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 min_range;
key_range max_range; key_range max_range;
min_range.key= (byte*) key_val; 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; for(i= 0, sel_arg= scan->sel_arg; sel_arg;
i++, sel_arg= sel_arg->next_key_part) 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) if (cur_covered != prev_covered)
{ {
/* create (part1val, ..., part{n-1}val) tuple. */ /* create (part1val, ..., part{n-1}val) tuple. */