summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <serg@serg.mylan>2003-12-13 18:49:45 +0100
committerunknown <serg@serg.mylan>2003-12-13 18:49:45 +0100
commitcb8bca902775418cbf4b6bfdce44e7908037ecaa (patch)
treeff3061c56c7297f2f0c4a4438faace18ee51c403 /mysql-test
parent79ecd80b164e5021f2265124615aea512899febb (diff)
parent35689c09170fbda13140f59e1df56a62455a3977 (diff)
downloadmariadb-git-cb8bca902775418cbf4b6bfdce44e7908037ecaa.tar.gz
Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/func_set.result6
-rw-r--r--mysql-test/t/func_set.test5
2 files changed, 11 insertions, 0 deletions
diff --git a/mysql-test/r/func_set.result b/mysql-test/r/func_set.result
index 2a3631140b0..d51bc24112a 100644
--- a/mysql-test/r/func_set.result
+++ b/mysql-test/r/func_set.result
@@ -50,3 +50,9 @@ id elt(two.val,'one','two')
2 one
4 two
drop table t1,t2;
+SELECT INTERVAL(13, 7, 14, 21, 28, 35, 42, 49, 56);
+INTERVAL(13, 7, 14, 21, 28, 35, 42, 49, 56)
+1
+SELECT INTERVAL(13, 7, 14, 21, 28, 35, 42, 49, 56, 77);
+INTERVAL(13, 7, 14, 21, 28, 35, 42, 49, 56, 77)
+1
diff --git a/mysql-test/t/func_set.test b/mysql-test/t/func_set.test
index 7d24140c75d..7a7ad25f9c4 100644
--- a/mysql-test/t/func_set.test
+++ b/mysql-test/t/func_set.test
@@ -35,3 +35,8 @@ insert into t2 values (1,1),(2,1),(3,1),(4,2);
select one.id, elt(two.val,'one','two') from t1 one, t2 two where two.id=one.id;
select one.id, elt(two.val,'one','two') from t1 one, t2 two where two.id=one.id order by one.id;
drop table t1,t2;
+
+# some more INTERVAL tests
+
+SELECT INTERVAL(13, 7, 14, 21, 28, 35, 42, 49, 56);
+SELECT INTERVAL(13, 7, 14, 21, 28, 35, 42, 49, 56, 77);