mirror of
https://github.com/MariaDB/server.git
synced 2025-01-19 13:32:33 +01:00
8a7bc05288
(4.1 version, with post-review fixes) The fix for another Bug (6439) limited FROM_UNIXTIME() to TIMESTAMP_MAX_VALUE which is 2145916799 or 2037-12-01 23:59:59 GMT, however unix timestamp in general is not considered to be limited by this value. All dates up to power(2,31)-1 are valid. This patch extends allowed TIMESTAMP range so, that max TIMESTAMP value is power(2,31)-1. It also corrects FROM_UNIXTIME() and UNIX_TIMESTAMP() functions, so that max allowed UNIX_TIMESTAMP() is power(2,31)-1. FROM_UNIXTIME() is fixed accordingly to allow conversion of dates up to 2038-01-19 03:14:07 UTC. The patch also fixes CONVERT_TZ() function to allow extended range of dates. The main problem solved in the patch is possible overflows of variables, used in broken-time representation to time_t conversion (required for UNIX_TIMESTAMP). acinclude.m4: Add new macro to check time_t range configure.in: Call the macro to check time_t range include/my_time.h: Move time-related defines to proper place. Add a function to perform a rough check if a TIMESTAMP value fits into the boundaries. Note: it is defined as "static inline", as otherwise libmysql won't compile (due to the way how gcc handles "inline" directive). mysql-test/r/func_time.result: Update test result mysql-test/r/timezone.result: Update test result mysql-test/r/timezone2.result: Update test result mysql-test/t/func_time.test: Add test for Bug#9191 and update test to be consistent with new TIMESTAMP boundaries mysql-test/t/timezone.test: Update old tests to be consistent with new TIMESTAMP boundaries mysql-test/t/timezone2.test: Update tests for convert_tz to be consistent with new TIMESTAMP boundaries sql/item_timefunc.cc: Fix convert_tz to allow dates from the new (extended) TIMESTAMP range sql/mysql_priv.h: Move time handling defaults to my_time.h sql-common/my_time.c: Because of increased TIMESTAMP_MAX_VALUE overflows in my_system_gmt_sec() became possible. Here we make it safe against the overflows by stepping back from the boundary dates which are likely to trigger them. sql/time.cc: Update TIME_to_timestamp to allow conversion of extended date range sql/tztime.cc: Fix new (4.1) implementation of broken-down time representation to time_t conversion routine to avoid overflows during conversion of boundary dates mysql-test/r/timezone4.result: New BitKeeper file ``mysql-test/r/timezone4.result'' mysql-test/t/timezone4-master.opt: New BitKeeper file ``mysql-test/t/timezone4-master.opt'' mysql-test/t/timezone4.test: New BitKeeper file ``mysql-test/t/timezone4.test''
219 lines
7.1 KiB
Text
219 lines
7.1 KiB
Text
# This script tests our own time zone support functions
|
|
|
|
# Preparing playground
|
|
--disable_warnings
|
|
drop table if exists t1, t2;
|
|
--enable_warnings
|
|
|
|
|
|
#
|
|
# Let us first check +HH:MM style timezones
|
|
#
|
|
create table t1 (ts timestamp);
|
|
|
|
set time_zone='+00:00';
|
|
select unix_timestamp(utc_timestamp())-unix_timestamp(current_timestamp());
|
|
insert into t1 (ts) values ('2003-03-30 02:30:00');
|
|
|
|
set time_zone='+10:30';
|
|
select unix_timestamp(utc_timestamp())-unix_timestamp(current_timestamp());
|
|
insert into t1 (ts) values ('2003-03-30 02:30:00');
|
|
|
|
set time_zone='-10:00';
|
|
select unix_timestamp(utc_timestamp())-unix_timestamp(current_timestamp());
|
|
insert into t1 (ts) values ('2003-03-30 02:30:00');
|
|
|
|
# Here we will get different results
|
|
select * from t1;
|
|
|
|
drop table t1;
|
|
|
|
|
|
#
|
|
# Let us try DB specified time zones
|
|
#
|
|
select Name from mysql.time_zone_name where Name in
|
|
('UTC','Universal','MET','Europe/Moscow','leap/Europe/Moscow');
|
|
|
|
create table t1 (i int, ts timestamp);
|
|
|
|
set time_zone='MET';
|
|
|
|
# We check common date time value and non existent or ambiguios values
|
|
# Normal value without DST
|
|
insert into t1 (i, ts) values
|
|
(unix_timestamp('2003-03-01 00:00:00'),'2003-03-01 00:00:00');
|
|
# Values around and in spring time-gap
|
|
insert into t1 (i, ts) values
|
|
(unix_timestamp('2003-03-30 01:59:59'),'2003-03-30 01:59:59'),
|
|
(unix_timestamp('2003-03-30 02:30:00'),'2003-03-30 02:30:00'),
|
|
(unix_timestamp('2003-03-30 03:00:00'),'2003-03-30 03:00:00');
|
|
# Normal value with DST
|
|
insert into t1 (i, ts) values
|
|
(unix_timestamp('2003-05-01 00:00:00'),'2003-05-01 00:00:00');
|
|
# Ambiguos values (also check for determenism)
|
|
insert into t1 (i, ts) values
|
|
(unix_timestamp('2003-10-26 01:00:00'),'2003-10-26 01:00:00'),
|
|
(unix_timestamp('2003-10-26 02:00:00'),'2003-10-26 02:00:00'),
|
|
(unix_timestamp('2003-10-26 02:59:59'),'2003-10-26 02:59:59'),
|
|
(unix_timestamp('2003-10-26 04:00:00'),'2003-10-26 04:00:00'),
|
|
(unix_timestamp('2003-10-26 02:59:59'),'2003-10-26 02:59:59');
|
|
|
|
set time_zone='UTC';
|
|
|
|
select * from t1;
|
|
|
|
delete from t1;
|
|
|
|
# Simple check for 'Europe/Moscow' time zone just for showing that it works
|
|
set time_zone='Europe/Moscow';
|
|
insert into t1 (i, ts) values
|
|
(unix_timestamp('2004-01-01 00:00:00'),'2004-01-01 00:00:00'),
|
|
(unix_timestamp('2004-03-28 02:30:00'),'2004-03-28 02:30:00'),
|
|
(unix_timestamp('2004-08-01 00:00:00'),'2003-08-01 00:00:00'),
|
|
(unix_timestamp('2004-10-31 02:30:00'),'2004-10-31 02:30:00');
|
|
select * from t1;
|
|
delete from t1;
|
|
|
|
|
|
#
|
|
# Check for time zone with leap seconds
|
|
# Values in ts column must be the same but values in i column should
|
|
# differ from corresponding values for Europe/Moscow a bit.
|
|
#
|
|
set time_zone='leap/Europe/Moscow';
|
|
insert into t1 (i, ts) values
|
|
(unix_timestamp('2004-01-01 00:00:00'),'2004-01-01 00:00:00'),
|
|
(unix_timestamp('2004-03-28 02:30:00'),'2004-03-28 02:30:00'),
|
|
(unix_timestamp('2004-08-01 00:00:00'),'2003-08-01 00:00:00'),
|
|
(unix_timestamp('2004-10-31 02:30:00'),'2004-10-31 02:30:00');
|
|
select * from t1;
|
|
delete from t1;
|
|
# Let us test leap jump
|
|
insert into t1 (i, ts) values
|
|
(unix_timestamp('1981-07-01 03:59:59'),'1981-07-01 03:59:59'),
|
|
(unix_timestamp('1981-07-01 04:00:00'),'1981-07-01 04:00:00');
|
|
select * from t1;
|
|
# Additional 60ieth second!
|
|
select from_unixtime(362793609);
|
|
|
|
drop table t1;
|
|
|
|
|
|
#
|
|
# Let us test range for TIMESTAMP
|
|
#
|
|
create table t1 (ts timestamp);
|
|
set time_zone='UTC';
|
|
insert into t1 values ('0000-00-00 00:00:00'),('1969-12-31 23:59:59'),
|
|
('1970-01-01 00:00:00'),('1970-01-01 00:00:01'),
|
|
('2038-01-19 03:14:07'),('2038-01-19 03:14:08');
|
|
select * from t1;
|
|
delete from t1;
|
|
# MET time zone has range shifted by one hour
|
|
set time_zone='MET';
|
|
insert into t1 values ('0000-00-00 00:00:00'),('1970-01-01 00:30:00'),
|
|
('1970-01-01 01:00:00'),('1970-01-01 01:00:01'),
|
|
('2038-01-19 04:14:07'),('2038-01-19 04:14:08');
|
|
select * from t1;
|
|
delete from t1;
|
|
# same for +01:30 time zone
|
|
set time_zone='+01:30';
|
|
insert into t1 values ('0000-00-00 00:00:00'),('1970-01-01 01:00:00'),
|
|
('1970-01-01 01:30:00'),('1970-01-01 01:30:01'),
|
|
('2038-01-19 04:44:07'),('2038-01-19 04:44:08');
|
|
select * from t1;
|
|
|
|
drop table t1;
|
|
|
|
|
|
#
|
|
# Test of show variables
|
|
#
|
|
show variables like 'time_zone';
|
|
set time_zone = default;
|
|
show variables like 'time_zone';
|
|
|
|
|
|
#
|
|
# Let us try some invalid time zone specifications
|
|
#
|
|
--error 1298
|
|
set time_zone= '0';
|
|
--error 1298
|
|
set time_zone= '0:0';
|
|
--error 1298
|
|
set time_zone= '-20:00';
|
|
--error 1298
|
|
set time_zone= '+20:00';
|
|
--error 1298
|
|
set time_zone= 'Some/Unknown/Time/Zone';
|
|
|
|
|
|
# Let us check that aliases for time zones work and they are
|
|
# case-insensitive
|
|
select convert_tz(now(),'UTC', 'Universal') = now();
|
|
select convert_tz(now(),'utc', 'UTC') = now();
|
|
|
|
|
|
#
|
|
# Let us test CONVERT_TZ function (may be func_time.test is better place).
|
|
#
|
|
select convert_tz('1917-11-07 12:00:00', 'MET', 'UTC');
|
|
select convert_tz('1970-01-01 01:00:00', 'MET', 'UTC');
|
|
select convert_tz('1970-01-01 01:00:01', 'MET', 'UTC');
|
|
select convert_tz('2003-03-01 00:00:00', 'MET', 'UTC');
|
|
select convert_tz('2003-03-30 01:59:59', 'MET', 'UTC');
|
|
select convert_tz('2003-03-30 02:30:00', 'MET', 'UTC');
|
|
select convert_tz('2003-03-30 03:00:00', 'MET', 'UTC');
|
|
select convert_tz('2003-05-01 00:00:00', 'MET', 'UTC');
|
|
select convert_tz('2003-10-26 01:00:00', 'MET', 'UTC');
|
|
select convert_tz('2003-10-26 02:00:00', 'MET', 'UTC');
|
|
select convert_tz('2003-10-26 02:59:59', 'MET', 'UTC');
|
|
select convert_tz('2003-10-26 04:00:00', 'MET', 'UTC');
|
|
select convert_tz('2038-01-19 04:14:07', 'MET', 'UTC');
|
|
select convert_tz('2038-01-19 04:14:08', 'MET', 'UTC');
|
|
select convert_tz('2103-01-01 04:00:00', 'MET', 'UTC');
|
|
|
|
# Let us test variable time zone argument
|
|
create table t1 (tz varchar(3));
|
|
insert into t1 (tz) values ('MET'), ('UTC');
|
|
select tz, convert_tz('2003-12-31 00:00:00',tz,'UTC'), convert_tz('2003-12-31 00:00:00','UTC',tz) from t1 order by tz;
|
|
drop table t1;
|
|
|
|
# Parameters to CONVERT_TZ() what should give NULL
|
|
select convert_tz('2003-12-31 04:00:00', NULL, 'UTC');
|
|
select convert_tz('2003-12-31 04:00:00', 'SomeNotExistingTimeZone', 'UTC');
|
|
select convert_tz('2003-12-31 04:00:00', 'MET', 'SomeNotExistingTimeZone');
|
|
select convert_tz('2003-12-31 04:00:00', 'MET', NULL);
|
|
select convert_tz( NULL, 'MET', 'UTC');
|
|
|
|
#
|
|
# Test for bug #4508 "CONVERT_TZ() function with new time zone as param
|
|
# crashes server." (Was caused by improperly worked mechanism of time zone
|
|
# dynamical loading).
|
|
#
|
|
create table t1 (ts timestamp);
|
|
set timestamp=1000000000;
|
|
insert into t1 (ts) values (now());
|
|
select convert_tz(ts, @@time_zone, 'Japan') from t1;
|
|
drop table t1;
|
|
|
|
#
|
|
# Test for bug #7705 "CONVERT_TZ() crashes with subquery/WHERE on index
|
|
# column". Queries in which one of time zone arguments of CONVERT_TZ() is
|
|
# determined as constant only at val() stage (not at fix_fields() stage),
|
|
# should not crash server.
|
|
#
|
|
select convert_tz('2005-01-14 17:00:00', 'UTC', custTimeZone) from (select 'UTC' as custTimeZone) as tmp;
|
|
|
|
#
|
|
# Test for bug #7899 "CREATE TABLE .. SELECT .. and CONVERT_TZ() function
|
|
# does not work well together". The following statement should return only
|
|
# one NULL row and not result of full join.
|
|
#
|
|
create table t1 select convert_tz(NULL, NULL, NULL);
|
|
select * from t1;
|
|
drop table t1;
|
|
|
|
# End of 4.1 tests
|