diff options
| author | unknown <gkodinov/kgeorge@magare.gmz> | 2007-11-26 13:33:36 +0200 |
|---|---|---|
| committer | unknown <gkodinov/kgeorge@magare.gmz> | 2007-11-26 13:33:36 +0200 |
| commit | 9eb12eb945a37de43f6eefef26535e0ac0f4a128 (patch) | |
| tree | c2d605b6be41a5e5f9d5f5f0b7049f25274f81a9 /sql/sql_select.cc | |
| parent | aab5779bcab9aa3c18eb556a4222e879e26cdd07 (diff) | |
| parent | 429abc58452ce57256d6aacaece77d1672bccadf (diff) | |
| download | mariadb-git-9eb12eb945a37de43f6eefef26535e0ac0f4a128.tar.gz | |
Merge magare.gmz:/home/kgeorge/mysql/work/B32268-5.0-opt
into magare.gmz:/home/kgeorge/mysql/work/B32268-5.1-opt
mysql-test/r/group_min_max.result:
Auto merged
mysql-test/t/group_min_max.test:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index f379542f8d7..fab46b4e1eb 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -10570,7 +10570,8 @@ Next_select_func setup_end_select_func(JOIN *join) /* Set up select_end */ if (table) { - if (table->group && tmp_tbl->sum_func_count) + if (table->group && tmp_tbl->sum_func_count && + !tmp_tbl->precomputed_group_by) { if (table->s->keys) { |