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

Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1

Browse Source 
into moonbone.local:/work/12887-bug-4.1-mysql
This commit is contained in:
evgen@moonbone.local 2005-09-15 21:34:53 +04:00
commit dbfc28cec1
3 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mysql-test/r/olap.result
View File

@ -529,3 +529,15 @@ a LENGTH(a) COUNT(*)
2 1 1 2 1 1
NULL NULL 2 NULL NULL 2
DROP TABLE t1; DROP TABLE t1;
create table t1 ( a varchar(9), b int );
insert into t1 values('a',1),(null,2);
select a, max(b) from t1 group by a with rollup;
a max(b)
NULL 2
a 1
NULL 2
select distinct a, max(b) from t1 group by a with rollup;
a max(b)
NULL 2
a 1
drop table t1;

9
mysql-test/t/olap.test
View File

@ -263,4 +263,13 @@ SELECT * FROM (SELECT a, LENGTH(a), COUNT(*) FROM t1 GROUP BY a WITH ROLLUP) t;
DROP TABLE t1; DROP TABLE t1;
#
# Bug #12887 Distinct is not always applied after rollup
#
create table t1 ( a varchar(9), b int );
insert into t1 values('a',1),(null,2);
select a, max(b) from t1 group by a with rollup;
select distinct a, max(b) from t1 group by a with rollup;
drop table t1;
# End of 4.1 tests # End of 4.1 tests

2
sql/sql_select.cc
View File

@ -618,7 +618,7 @@ JOIN::optimize()
} }
if (group_list || tmp_table_param.sum_func_count) if (group_list || tmp_table_param.sum_func_count)
{ {
if (! hidden_group_fields) if (! hidden_group_fields && rollup.state == ROLLUP::STATE_NONE)
select_distinct=0; select_distinct=0;
} }
else if (select_distinct && tables - const_tables == 1) else if (select_distinct && tables - const_tables == 1)