database/mariadb
database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-05-13 01:01:44 +03:00
Code

Post-merge fixes

Browse Source
This commit is contained in:
sergefp@mysql.com 2004-06-14 12:39:46 +04:00
parent ee0a516ccd
commit cd98a2d82d
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sql/opt_range.cc
View File

@ -2433,7 +2433,7 @@ bool ror_intersect_add(const PARAM *param, ROR_INTERSECT_INFO *info,
KEY_PART_INFO *key_part= KEY_PART_INFO *key_part=
info->param->table->key_info[ror_scan->keynr].key_part; info->param->table->key_info[ror_scan->keynr].key_part;
double selectivity_mult= 1.0; double selectivity_mult= 1.0;
char key_val[MAX_KEY_LENGTH+MAX_FIELD_WIDTH]; /* key values tuple */ byte key_val[MAX_KEY_LENGTH+MAX_FIELD_WIDTH]; /* key values tuple */
DBUG_ENTER("ror_intersect_add"); DBUG_ENTER("ror_intersect_add");
DBUG_PRINT("info", ("Current selectivity= %g", info->records_fract)); DBUG_PRINT("info", ("Current selectivity= %g", info->records_fract));
@ -2445,6 +2445,12 @@ bool ror_intersect_add(const PARAM *param, ROR_INTERSECT_INFO *info,
bitmap_is_set(&info->covered_fields, key_part->fieldnr); bitmap_is_set(&info->covered_fields, key_part->fieldnr);
ha_rows prev_records= param->table->file->records; ha_rows prev_records= param->table->file->records;
key_range min_range;
key_range max_range;
min_range.key= (byte*) key_val;
min_range.flag= HA_READ_KEY_EXACT;
max_range.key= (byte*) key_val;
max_range.flag= HA_READ_AFTER_KEY;
for(i= 0, sel_arg= ror_scan->sel_arg; sel_arg; for(i= 0, sel_arg= ror_scan->sel_arg; sel_arg;
i++, sel_arg= sel_arg->next_key_part) i++, sel_arg= sel_arg->next_key_part)
@ -2466,12 +2472,11 @@ bool ror_intersect_add(const PARAM *param, ROR_INTERSECT_INFO *info,
} }
} }
ha_rows records; ha_rows records;
min_range.length= max_range.length= key_ptr - key_val;
records= param->table->file-> records= param->table->file->
records_in_range(ror_scan->keynr, records_in_range(ror_scan->keynr,
(byte*)key_val, key_ptr - key_val, &min_range,
HA_READ_KEY_EXACT, &max_range);
(byte*)key_val, key_ptr - key_val,
HA_READ_AFTER_KEY);
if (cur_covered) if (cur_covered)
{ {
/* uncovered -> covered */ /* uncovered -> covered */