1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix compile error and test failure:

Browse Source 
- Don't use 'res' uninitialized
- multiply it by col_non_nulls before set_if_bigger(...) call.
This commit is contained in:
Sergei Petrunia 2021-08-27 16:49:45 +03:00
parent 096995b106
commit a48e63c5fe
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/sql_statistics.cc
View File

@ -4369,8 +4369,8 @@ double get_column_range_cardinality(Field *field,
if (hist && hist->is_usable(thd)) if (hist && hist->is_usable(thd))
{ {
sel= hist->range_selectivity(field, min_endp, max_endp); sel= hist->range_selectivity(field, min_endp, max_endp);
set_if_bigger(res, col_stats->get_avg_frequency()); }
} else else
{ {
double min_mp_pos, max_mp_pos; double min_mp_pos, max_mp_pos;
if (min_endp && !(field->null_ptr && min_endp->key[0])) if (min_endp && !(field->null_ptr && min_endp->key[0]))
@ -4395,6 +4395,7 @@ double get_column_range_cardinality(Field *field,
sel = (max_mp_pos - min_mp_pos); sel = (max_mp_pos - min_mp_pos);
} }
res= col_non_nulls * sel; res= col_non_nulls * sel;
set_if_bigger(res, col_stats->get_avg_frequency());
} }
else else
res= col_non_nulls; res= col_non_nulls;