summaryrefslogtreecommitdiff
path: root/mysql-test/r/olap.result
diff options
context:
space:
mode:
authorAlexey Kopytov <Alexey.Kopytov@Sun.com>2009-10-30 18:59:06 +0300
committerAlexey Kopytov <Alexey.Kopytov@Sun.com>2009-10-30 18:59:06 +0300
commit23cbd659a018f1fb757d1877b4eb0694f60acb65 (patch)
treec030c3653a0782ffae0c4629fb59f7221e43e46d /mysql-test/r/olap.result
parentead175bb07a9101488fa59794900f65e3186a88d (diff)
parentb67cdaa351122ca0d8badd2f8fb4ec9085c58933 (diff)
downloadmariadb-git-23cbd659a018f1fb757d1877b4eb0694f60acb65.tar.gz
Automerge.
Diffstat (limited to 'mysql-test/r/olap.result')
-rw-r--r--mysql-test/r/olap.result20
1 files changed, 20 insertions, 0 deletions
diff --git a/mysql-test/r/olap.result b/mysql-test/r/olap.result
index 4540c9d5218..a7516d97888 100644
--- a/mysql-test/r/olap.result
+++ b/mysql-test/r/olap.result
@@ -733,4 +733,24 @@ SELECT 1 FROM t1 GROUP BY (DATE(NULL)) WITH ROLLUP;
1
1
DROP TABLE t1;
+#
+# Bug #48131: crash group by with rollup, distinct,
+# filesort, with temporary tables
+#
+CREATE TABLE t1 (a INT NOT NULL PRIMARY KEY);
+INSERT INTO t1 VALUES (1), (2);
+CREATE TABLE t2 (b INT);
+INSERT INTO t2 VALUES (100);
+SELECT a, b FROM t1, t2 GROUP BY a, b WITH ROLLUP;
+a b
+1 100
+1 NULL
+2 100
+2 NULL
+NULL NULL
+SELECT DISTINCT b FROM t1, t2 GROUP BY a, b WITH ROLLUP;
+b
+100
+NULL
+DROP TABLE t1, t2;
End of 5.0 tests