summaryrefslogtreecommitdiff
path: root/mysql-test/r/olap.result
diff options
context:
space:
mode:
authorigor@rurik.mysql.com <>2005-04-19 19:00:02 -0700
committerigor@rurik.mysql.com <>2005-04-19 19:00:02 -0700
commit87ade2e6f7e1feaaa057a797c66e314d066b2d56 (patch)
tree7b0553d2fe54a30e9b5b67415514daa3243cc465 /mysql-test/r/olap.result
parentdee14fdd40a5049cded22c43819592d6ed9a89a1 (diff)
parent25c396628a5db12756e46e4e45708583bf1a0a81 (diff)
downloadmariadb-git-87ade2e6f7e1feaaa057a797c66e314d066b2d56.tar.gz
Merge of the fix for bug #9681 4.1->5.0
Diffstat (limited to 'mysql-test/r/olap.result')
-rw-r--r--mysql-test/r/olap.result13
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;