database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Merge magare.gmz:/home/kgeorge/mysql/work/B32268-5.0-opt

Browse Source 
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
This commit is contained in:
unknown
2007-11-26 13:33:36 +02:00
parent aab5779bca 429abc5845
commit 9eb12eb945
3 changed files with 72 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_select.cc
View File

@@ -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)
{