diff options
| author | unknown <evgen@sunlight.local> | 2006-03-30 10:22:03 +0400 |
|---|---|---|
| committer | unknown <evgen@sunlight.local> | 2006-03-30 10:22:03 +0400 |
| commit | ff4de9050149bd1ab1727d7f226e094ddcdcd355 (patch) | |
| tree | 66fc48462ac676069fb2724a05ef8103d848c58c /mysql-test | |
| parent | a48af9eb2cfdb4f9a6d817495e7a8c85d4125ec3 (diff) | |
| parent | b25315469e118c89c964d1c266e7164d3580eda5 (diff) | |
| download | mariadb-git-ff4de9050149bd1ab1727d7f226e094ddcdcd355.tar.gz | |
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into sunlight.local:/local_work/15560-bug-4.1-mysql
sql/sql_table.cc:
Auto merged
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/func_gconcat.result | 15 | ||||
| -rw-r--r-- | mysql-test/t/func_gconcat.test | 8 |
2 files changed, 23 insertions, 0 deletions
diff --git a/mysql-test/r/func_gconcat.result b/mysql-test/r/func_gconcat.result index 200b4a4d53b..3cb8da7f63f 100644 --- a/mysql-test/r/func_gconcat.result +++ b/mysql-test/r/func_gconcat.result @@ -589,3 +589,18 @@ GROUP_CONCAT(a ORDER BY a) ,x ,z DROP TABLE t1; +create table t1(f1 int); +insert into t1 values(1),(2),(3); +select f1, group_concat(f1+1) from t1 group by f1 with rollup; +f1 group_concat(f1+1) +1 2 +2 3 +3 4 +NULL 2,3,4 +select count(distinct (f1+1)) from t1 group by f1 with rollup; +count(distinct (f1+1)) +1 +1 +1 +3 +drop table t1; diff --git a/mysql-test/t/func_gconcat.test b/mysql-test/t/func_gconcat.test index eb1cbc3d667..f116aa6f164 100644 --- a/mysql-test/t/func_gconcat.test +++ b/mysql-test/t/func_gconcat.test @@ -382,4 +382,12 @@ SELECT GROUP_CONCAT(a ORDER BY a) FROM t1 GROUP BY id; DROP TABLE t1; +# +# Bug #15560: GROUP_CONCAT wasn't ready for WITH ROLLUP queries +# +create table t1(f1 int); +insert into t1 values(1),(2),(3); +select f1, group_concat(f1+1) from t1 group by f1 with rollup; +select count(distinct (f1+1)) from t1 group by f1 with rollup; +drop table t1; # End of 4.1 tests |