summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <Sinisa@sinisa.nasamreza.org>2002-05-24 18:25:17 +0300
committerunknown <Sinisa@sinisa.nasamreza.org>2002-05-24 18:25:17 +0300
commit5abc01a898154d9d34bdaabb141d8c3b4b32cf4e (patch)
tree581e7d28a198559f0cccf1012bf951234431a4cf /mysql-test
parent29e70bfbbf7be1a4fe9c70c0cbc71dd74bdb91e8 (diff)
downloadmariadb-git-5abc01a898154d9d34bdaabb141d8c3b4b32cf4e.tar.gz
Changing tests
BitKeeper/deleted/.del-sel000004.test~445526a8a20de101: Delete: mysql-test/t/sel000004.test BitKeeper/deleted/.del-sel000004.result~360af2095c88cb8c: Delete: mysql-test/r/sel000004.result
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/group_by.result4
-rw-r--r--mysql-test/r/sel000004.result4
-rw-r--r--mysql-test/t/group_by.test16
-rw-r--r--mysql-test/t/sel000004.test16
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;