diff options
| author | Igor Babaev <igor@askmonty.org> | 2012-08-14 12:42:14 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2012-08-14 12:42:14 -0700 |
| commit | 822e5da0d069e6567713464e7492097fab33e55d (patch) | |
| tree | acfd13bd545ee4d5fe2209922827588be09b6e42 /sql/opt_range.cc | |
| parent | 3116e3ad6164c96edc2a27c3438f325c4dc464f3 (diff) | |
| parent | 7cc2f8decabe83fb304458748ba907f011848309 (diff) | |
| download | mariadb-git-822e5da0d069e6567713464e7492097fab33e55d.tar.gz | |
Merge 5.5->5.5-mwl248
Diffstat (limited to 'sql/opt_range.cc')
| -rw-r--r-- | sql/opt_range.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sql/opt_range.cc b/sql/opt_range.cc index e373e5197fe..11b397e3e0c 100644 --- a/sql/opt_range.cc +++ b/sql/opt_range.cc @@ -11803,9 +11803,10 @@ get_best_group_min_max(PARAM *param, SEL_TREE *tree, double read_time) have_min= TRUE; else if (min_max_item->sum_func() == Item_sum::MAX_FUNC) have_max= TRUE; - else if (min_max_item->sum_func() == Item_sum::COUNT_DISTINCT_FUNC || - min_max_item->sum_func() == Item_sum::SUM_DISTINCT_FUNC || - min_max_item->sum_func() == Item_sum::AVG_DISTINCT_FUNC) + else if (is_agg_distinct && + (min_max_item->sum_func() == Item_sum::COUNT_DISTINCT_FUNC || + min_max_item->sum_func() == Item_sum::SUM_DISTINCT_FUNC || + min_max_item->sum_func() == Item_sum::AVG_DISTINCT_FUNC)) continue; else DBUG_RETURN(NULL); |