summaryrefslogtreecommitdiff
path: root/mysql-test/r/timezone.result
diff options
context:
space:
mode:
authorunknown <dlenev@mysql.com>2004-01-30 19:15:11 +0300
committerunknown <dlenev@mysql.com>2004-01-30 19:15:11 +0300
commit241a65e921dac7b596bb0b1ca56695fe50c45ef2 (patch)
tree4ec74f20317ff0acdaa2c6e6917f33e72d11f720 /mysql-test/r/timezone.result
parent671a085430e07e98c224c9e1843be313519cbc16 (diff)
downloadmariadb-git-241a65e921dac7b596bb0b1ca56695fe50c45ef2.tar.gz
Fix for bug #2523 '"func_time" test fails on QNX'.
Moved all range checks for TIMESTAMP value to my_gmt_sec(). Also fixed check of upper boundary of TIMESTAMP range (which also now will catch datetime values which are too small for TIMESTAMP in case if time_t is unsigned). mysql-test/r/timezone.result: Added test which checks if TIMESTAMP range is checked correctly (current time zone is honoured and both upper and lower bounds of TIMESTAMP range are checked). mysql-test/t/timezone.test: Added test which checks if TIMESTAMP range is checked correctly (current time zone is honoured and both upper and lower bounds of TIMESTAMP range are checked). sql/field.cc: Check if datetime value is in TIMESTAMP range has moved to my_gmt_sec() function. sql/mysql_priv.h: Added more constants for checking if datetime is in allowed range for TIMESTAMP. sql/time.cc: Check if datetime value is in TIMESTAMP range has moved to my_gmt_sec() function. Fixed check of its return value to catch overflows in both directions and also overflows in case of unsigned time_t.
Diffstat (limited to 'mysql-test/r/timezone.result')
-rw-r--r--mysql-test/r/timezone.result6
1 files changed, 6 insertions, 0 deletions
diff --git a/mysql-test/r/timezone.result b/mysql-test/r/timezone.result
index 20706408075..15f0d4121c7 100644
--- a/mysql-test/r/timezone.result
+++ b/mysql-test/r/timezone.result
@@ -32,3 +32,9 @@ ts from_unixtime(ts)
1048989599 2003-03-30 03:59:59
1048989601 2003-03-30 04:00:01
DROP TABLE t1;
+select unix_timestamp('1970-01-01 01:00:00'),
+unix_timestamp('1970-01-01 01:00:01'),
+unix_timestamp('2038-01-01 00:59:59'),
+unix_timestamp('2038-01-01 01:00:00');
+unix_timestamp('1970-01-01 01:00:00') unix_timestamp('1970-01-01 01:00:01') unix_timestamp('2038-01-01 00:59:59') unix_timestamp('2038-01-01 01:00:00')
+0 1 2145916799 0