Changing tests

4 files changed, 20 insertions, 20 deletions

diff --git a/mysql-test/r/group_by.result b/mysql-test/r/group_by.result
index d5fcc7d85e8..aafeb64ee2a 100644
--- a/mysql-test/r/group_by.result
+++ b/mysql-test/r/group_by.result
@@ -64,3 +64,7 @@ score	count(*)
 3	3
 2	1
 1	2
+One	Two	sum(Four)
+1	1	16
+1	2	16
+1	3	16
diff --git a/mysql-test/r/sel000004.result b/mysql-test/r/sel000004.result
deleted file mode 100644
index d49d262f094..00000000000
--- a/mysql-test/r/sel000004.result
+++ /dev/null
@@ -1,4 +0,0 @@
-One	Two	sum(Four)
-1	1	16
-1	2	16
-1	3	16
diff --git a/mysql-test/t/group_by.test b/mysql-test/t/group_by.test
index efa1744feee..11408511e99 100644
--- a/mysql-test/t/group_by.test
+++ b/mysql-test/t/group_by.test
@@ -243,3 +243,19 @@ select sql_big_result spid,sum(userid) from t1 group by spid desc;
 explain select sql_big_result score,count(*) from t1 group by score desc;
 select sql_big_result score,count(*) from t1 group by score desc;
 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;