diff options
author | unknown <igor@rurik.mysql.com> | 2005-04-19 19:00:02 -0700 |
---|---|---|
committer | unknown <igor@rurik.mysql.com> | 2005-04-19 19:00:02 -0700 |
commit | 3125fed2a3f627f2d0242c8f63f5c2da741bcf20 (patch) | |
tree | 7b0553d2fe54a30e9b5b67415514daa3243cc465 /mysql-test/r/olap.result | |
parent | 8b001e2aba159e13339950f8c1cf1e65f0af5662 (diff) | |
parent | 6a97b07994f8d67c0f14b3979c932d69452ff94f (diff) | |
download | mariadb-git-3125fed2a3f627f2d0242c8f63f5c2da741bcf20.tar.gz |
Merge of the fix for bug #9681 4.1->5.0
mysql-test/r/olap.result:
Auto merged
mysql-test/t/olap.test:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'mysql-test/r/olap.result')
-rw-r--r-- | mysql-test/r/olap.result | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/mysql-test/r/olap.result b/mysql-test/r/olap.result index 91e52841c3b..06f474923eb 100644 --- a/mysql-test/r/olap.result +++ b/mysql-test/r/olap.result @@ -437,3 +437,16 @@ SELECT SQL_CALC_FOUND_ROWS a, SUM(b) FROM t1 GROUP BY a WITH ROLLUP LIMIT 1; a SUM(b) 1 4 DROP TABLE t1; +CREATE TABLE t1 (a int(11) NOT NULL); +INSERT INTO t1 VALUES (1),(2); +SELECT a, SUM(a) m FROM t1 GROUP BY a WITH ROLLUP; +a m +1 1 +2 2 +NULL 3 +SELECT * FROM ( SELECT a, SUM(a) m FROM t1 GROUP BY a WITH ROLLUP ) t2; +a m +1 1 +2 2 +NULL 3 +DROP TABLE t1; |