summaryrefslogtreecommitdiff
path: root/mysql-test/t/timezone.test
diff options
context:
space:
mode:
authormonty@mysql.com <>2003-12-14 21:31:02 +0100
committermonty@mysql.com <>2003-12-14 21:31:02 +0100
commit217226f9afcefb7918ce0aee5ac920dfdf73edf0 (patch)
treee661c1692af1d54159fe987e0c4f2697268c7ae4 /mysql-test/t/timezone.test
parent427ce41c3c29edc5fa357bf342b369e0a0611b98 (diff)
downloadmariadb-git-217226f9afcefb7918ce0aee5ac920dfdf73edf0.tar.gz
Portablity fix
Diffstat (limited to 'mysql-test/t/timezone.test')
-rw-r--r--mysql-test/t/timezone.test18
1 files changed, 12 insertions, 6 deletions
diff --git a/mysql-test/t/timezone.test b/mysql-test/t/timezone.test
index d9603c51766..ab732c11a34 100644
--- a/mysql-test/t/timezone.test
+++ b/mysql-test/t/timezone.test
@@ -3,7 +3,7 @@
-- require r/have_met_timezone.require
disable_query_log;
-show variables like "timezone";
+select FROM_UNIXTIME(24*3600);
enable_query_log;
# Initialization
@@ -11,6 +11,17 @@ enable_query_log;
DROP TABLE IF EXISTS t1;
--enable_warnings
+show variables like "timezone";
+
+#
+# Test unix timestamp
+#
+select @a:=FROM_UNIXTIME(1);
+select unix_timestamp(@a);
+
+#
+# Test of some values, including some with daylight saving time
+#
CREATE TABLE t1 (ts int);
INSERT INTO t1 (ts) VALUES (Unix_timestamp('2002-10-27 01:00'));
@@ -27,8 +38,3 @@ INSERT INTO t1 (ts) VALUES (Unix_timestamp('2003-03-30 04:00:01'));
SELECT ts,from_unixtime(ts) FROM t1;
DROP TABLE t1;
-#
-# Test unix timestamp
-#
-select @a:=FROM_UNIXTIME(1);
-select unix_timestamp(@a);