summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <ramil@mysql.com>2005-05-09 12:06:42 +0500
committerunknown <ramil@mysql.com>2005-05-09 12:06:42 +0500
commit312942b9b09a3f93f2fc4ee8924243f1bb01e111 (patch)
tree4b7046cc9d589ca5e434fa3dc7c88f5a65236f4d /mysql-test
parent291a628ec5a66e2339c9bceae585ab769dfe8f00 (diff)
parent51e862786b47792a78a1931fff728b2fa0059659 (diff)
downloadmariadb-git-312942b9b09a3f93f2fc4ee8924243f1bb01e111.tar.gz
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/ram/work/5.0
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/group_min_max.result7
-rw-r--r--mysql-test/t/group_min_max.test11
2 files changed, 18 insertions, 0 deletions
diff --git a/mysql-test/r/group_min_max.result b/mysql-test/r/group_min_max.result
index 766e43b2299..3037047b513 100644
--- a/mysql-test/r/group_min_max.result
+++ b/mysql-test/r/group_min_max.result
@@ -1961,3 +1961,10 @@ a varchar(30), b varchar(30), primary key(a), key(b)
select distinct a from t1;
a
drop table t1;
+create table t1(a int, key(a)) engine=innodb;
+insert into t1 values(1);
+select a, count(a) from t1 group by a with rollup;
+a count(a)
+1 1
+NULL 1
+drop table t1;
diff --git a/mysql-test/t/group_min_max.test b/mysql-test/t/group_min_max.test
index d85b3395853..9feb4f33682 100644
--- a/mysql-test/t/group_min_max.test
+++ b/mysql-test/t/group_min_max.test
@@ -610,3 +610,14 @@ create table t1 (
--enable_warnings
select distinct a from t1;
drop table t1;
+
+#
+# Bug #9798: group by with rollup
+#
+
+--disable_warnings
+create table t1(a int, key(a)) engine=innodb;
+--enable_warnings
+insert into t1 values(1);
+select a, count(a) from t1 group by a with rollup;
+drop table t1;