diff options
| author | Varun Gupta <varun.gupta@mariadb.com> | 2021-02-15 11:16:20 +0530 |
|---|---|---|
| committer | Varun Gupta <varun.gupta@mariadb.com> | 2021-02-17 16:15:43 +0530 |
| commit | d542c8d61f47ee46a09fd10a046f262ff6a08336 (patch) | |
| tree | 8a16e051b969d0fcdd8528f61ebc46a5bba11fb4 | |
| parent | 37a10ddf9001e4d1e80a09a51f98e7e6579bbc84 (diff) | |
| download | mariadb-git-d542c8d61f47ee46a09fd10a046f262ff6a08336.tar.gz | |
Review fixes
| -rw-r--r-- | sql/sql_select.cc | 1 | ||||
| -rw-r--r-- | sql/sql_sort_nest.cc | 2 | ||||
| -rw-r--r-- | sql/sql_statistics.cc | 7 |
3 files changed, 7 insertions, 3 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 7dd7e8dc438..7595ed4c99b 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -10968,7 +10968,6 @@ bool JOIN::get_best_combination() j->table= NULL; j->ref.key = -1; j->on_expr_ref= (Item**) &null_ptr; - j->is_sort_nest= TRUE; j->records_read= calculate_record_count_for_sort_nest(tables); j->records= (ha_rows) j->records_read; j->cond_selectivity= 1.0; diff --git a/sql/sql_sort_nest.cc b/sql/sql_sort_nest.cc index aa1046eef53..2e862ed503c 100644 --- a/sql/sql_sort_nest.cc +++ b/sql/sql_sort_nest.cc @@ -467,6 +467,8 @@ void JOIN::substitutions_for_sjm_lookup(JOIN_TAB *sjm_tab, void JOIN::extract_condition_for_the_nest(Mat_join_tab_nest_info* nest_info) { + if (!conds) + return; DBUG_ASSERT(nest_info); Item *orig_cond= conds; Item *extracted_cond; diff --git a/sql/sql_statistics.cc b/sql/sql_statistics.cc index d1b5a9ab39e..e7c2536968d 100644 --- a/sql/sql_statistics.cc +++ b/sql/sql_statistics.cc @@ -3745,8 +3745,11 @@ double get_column_avg_frequency_via_indexes(Field * field) */ double get_column_avg_frequency(Field * field) { - return get_column_avg_frequency_via_indexes(field) || - get_column_avg_frequency_via_stat_tables(field); + double avg_freq_via_indexes= get_column_avg_frequency_via_indexes(field); + + if (avg_freq_via_indexes == 0) + return get_column_avg_frequency_via_stat_tables(field); + return avg_freq_via_indexes; } |