Test re-grouping

4 files changed, 36 insertions, 36 deletions

diff --git a/mysql-test/r/group_by.result b/mysql-test/r/group_by.result
index 2affdc1b653..aaa03f2668a 100644
--- a/mysql-test/r/group_by.result
+++ b/mysql-test/r/group_by.result
@@ -373,3 +373,23 @@ CONCAT(a, b)	count(*)
 abcdef	1
 hijklm	2
 DROP TABLE t1;
+drop table if exists t1;
+create table t1 (One int unsigned, Two int unsigned, Three int unsigned, Four int unsigned);
+insert into t1 values (1,2,1,4);
+insert into t1 values (1,2,2,4);
+insert into t1 values (1,2,3,4);
+insert into t1 values (1,2,4,4);
+insert into t1 values (1,1,1,4);
+insert into t1 values (1,1,2,4);
+insert into t1 values (1,1,3,4);
+insert into t1 values (1,1,4,4);
+insert into t1 values (1,3,1,4);
+insert into t1 values (1,3,2,4);
+insert into t1 values (1,3,3,4);
+insert into t1 values (1,3,4,4);
+select One, Two, sum(Four) from t1 group by One,Two;
+One	Two	sum(Four)
+1	1	16
+1	2	16
+1	3	16
+drop table if exists t1;
diff --git a/mysql-test/r/sel000004.result b/mysql-test/r/sel000004.result
deleted file mode 100644
index 4c1db164b28..00000000000
--- a/mysql-test/r/sel000004.result
+++ /dev/null
@@ -1,20 +0,0 @@
-drop table if exists t1;
-create table t1 (One int unsigned, Two int unsigned, Three int unsigned, Four int unsigned);
-insert into t1 values (1,2,1,4);
-insert into t1 values (1,2,2,4);
-insert into t1 values (1,2,3,4);
-insert into t1 values (1,2,4,4);
-insert into t1 values (1,1,1,4);
-insert into t1 values (1,1,2,4);
-insert into t1 values (1,1,3,4);
-insert into t1 values (1,1,4,4);
-insert into t1 values (1,3,1,4);
-insert into t1 values (1,3,2,4);
-insert into t1 values (1,3,3,4);
-insert into t1 values (1,3,4,4);
-select One, Two, sum(Four) from t1 group by One,Two;
-One	Two	sum(Four)
-1	1	16
-1	2	16
-1	3	16
-drop table if exists t1;
diff --git a/mysql-test/t/group_by.test b/mysql-test/t/group_by.test
index 17ad9588f1b..171b5510227 100644
--- a/mysql-test/t/group_by.test
+++ b/mysql-test/t/group_by.test
@@ -283,3 +283,19 @@ SELECT 1 FROM t1 GROUP BY CONCAT(a, b);
 INSERT INTO t1 values ('hij','klm');
 SELECT CONCAT(a, b),count(*) FROM t1 GROUP BY 1;
 DROP TABLE t1;
+drop table if exists t1;
+create table t1 (One int unsigned, Two int unsigned, Three int unsigned, Four int unsigned);
+insert into t1 values (1,2,1,4);
+insert into t1 values (1,2,2,4);
+insert into t1 values (1,2,3,4);
+insert into t1 values (1,2,4,4);
+insert into t1 values (1,1,1,4);
+insert into t1 values (1,1,2,4);
+insert into t1 values (1,1,3,4);
+insert into t1 values (1,1,4,4);
+insert into t1 values (1,3,1,4);
+insert into t1 values (1,3,2,4);
+insert into t1 values (1,3,3,4);
+insert into t1 values (1,3,4,4);
+select One, Two, sum(Four) from t1 group by One,Two;
+drop table if exists t1;
diff --git a/mysql-test/t/sel000004.test b/mysql-test/t/sel000004.test
deleted file mode 100644
index adb2bcbec57..00000000000
--- a/mysql-test/t/sel000004.test
+++ /dev/null
@@ -1,16 +0,0 @@
-drop table if exists t1;
-create table t1 (One int unsigned, Two int unsigned, Three int unsigned, Four int unsigned);
-insert into t1 values (1,2,1,4);
-insert into t1 values (1,2,2,4);
-insert into t1 values (1,2,3,4);
-insert into t1 values (1,2,4,4);
-insert into t1 values (1,1,1,4);
-insert into t1 values (1,1,2,4);
-insert into t1 values (1,1,3,4);
-insert into t1 values (1,1,4,4);
-insert into t1 values (1,3,1,4);
-insert into t1 values (1,3,2,4);
-insert into t1 values (1,3,3,4);
-insert into t1 values (1,3,4,4);
-select One, Two, sum(Four) from t1 group by One,Two;
-drop table if exists t1;