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

Merge 11.0 into 11.1

This commit is contained in:
Marko Mäkelä
2023-06-28 09:38:59 +03:00
86 changed files with 1983 additions and 1096 deletions

View File

@@ -7926,12 +7926,15 @@ static double apply_selectivity_for_table(JOIN_TAB *s,
/*
This is only taking into considering constant key parts used with
this table!
If no such conditions existed the following should hold:
If no such conditions existed the following should normally hold:
s->table->opt_range_condition_rows == s->found_rows ==
s->records.
The case when this does not hold is when using 'best splitting'
in which case s->records may be less than s->found_rows;
*/
DBUG_ASSERT(s->table->opt_range_condition_rows <= s->found_records);
dbl_records= rows2double(s->table->opt_range_condition_rows);
dbl_records= rows2double(MY_MIN(s->table->opt_range_condition_rows,
s->records));
}
DBUG_ASSERT(dbl_records <= s->records);