database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge 11.0 into 11.1

Browse Source
This commit is contained in:
Marko Mäkelä
2023-06-08 14:09:21 +03:00
parent d85a135647 5fb2c031f7
commit 3883eb63dc
165 changed files with 4391 additions and 1929 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sql/opt_range.cc
View File

@@ -11939,14 +11939,21 @@ ha_rows check_quick_select(PARAM *param, uint idx, ha_rows limit,
ha_rows table_records= param->table->stat_records();
if (rows > table_records)
{
ha_rows diff= rows - table_records;
/*
For any index the total number of records within all ranges
cannot be be bigger than the number of records in the table.
This check is needed as sometimes that table statistics or range
estimates may be slightly out of sync.
We cannot do this easily in the above multi_range_read_info_const()
call as then we would need to have similar adjustmends done
in the partitioning engine.
*/
rows= MY_MAX(table_records, 1);
param->quick_rows[keynr]= rows;
/* Adjust costs */
cost->comp_cost-= file->WHERE_COST * diff;
}
param->possible_keys.set_bit(keynr);
if (update_tbl_stats)
@@ -15794,7 +15801,8 @@ int QUICK_GROUP_MIN_MAX_SELECT::reset(void)
DBUG_ENTER("QUICK_GROUP_MIN_MAX_SELECT::reset");
seen_first_key= FALSE;
head->file->ha_start_keyread(index); /* We need only the key attributes */
if (!head->file->keyread_enabled())
head->file->ha_start_keyread(index); /* We need only the key attributes */
if ((result= file->ha_index_init(index,1)))
{