mirror of
https://github.com/MariaDB/server.git
synced 2025-01-29 02:05:57 +01:00
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into moonbone.local:/work/12887-bug-4.1-mysql
This commit is contained in:
commit
4805236e2f
3 changed files with 22 additions and 1 deletions
|
@ -529,3 +529,15 @@ a LENGTH(a) COUNT(*)
|
|||
2 1 1
|
||||
NULL NULL 2
|
||||
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;
|
||||
|
|
|
@ -263,4 +263,13 @@ SELECT * FROM (SELECT a, LENGTH(a), COUNT(*) FROM t1 GROUP BY a WITH ROLLUP) t;
|
|||
|
||||
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
|
||||
|
|
|
@ -618,7 +618,7 @@ JOIN::optimize()
|
|||
}
|
||||
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;
|
||||
}
|
||||
else if (select_distinct && tables - const_tables == 1)
|
||||
|
|
Loading…
Add table
Reference in a new issue