From e6ac94a63f1aef7d0bd6364a668602c3056cd73d Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 23 Oct 2013 15:22:47 +0300 Subject: [PATCH] MDEV-5133: Test suite tests *_func_view fail in time zones East of UTC+3 test time increased to be working on all timezones. --- .../suite/funcs_1/r/innodb_func_view.result | 46 +++++++++---------- .../suite/funcs_1/r/memory_func_view.result | 46 +++++++++---------- .../suite/funcs_1/r/myisam_func_view.result | 46 +++++++++---------- mysql-test/suite/funcs_1/views/func_view.inc | 2 +- 4 files changed, 70 insertions(+), 70 deletions(-) diff --git a/mysql-test/suite/funcs_1/r/innodb_func_view.result b/mysql-test/suite/funcs_1/r/innodb_func_view.result index dd376154100..b8958d0e88c 100644 --- a/mysql-test/suite/funcs_1/r/innodb_func_view.result +++ b/mysql-test/suite/funcs_1/r/innodb_func_view.result @@ -28,7 +28,7 @@ my_binary_30 = '', my_varbinary_1000 = '', my_datetime = '0001-01-01 00:00:00', my_date = '0001-01-01', -my_timestamp = '1970-01-01 03:00:01', +my_timestamp = '1970-01-01 14:00:01', my_time = '-838:59:59', my_year = '1901', my_bigint = -9223372036854775808, @@ -1276,7 +1276,7 @@ my_timestamp, id FROM t1_values WHERE select_id = 136 OR select_id IS NULL order by id; IFNULL(my_timestamp,'IS_NULL') my_timestamp id 0000-00-00 00:00:00 0000-00-00 00:00:00 1 -1970-01-01 03:00:01 1970-01-01 03:00:01 2 +1970-01-01 14:00:01 1970-01-01 14:00:01 2 2038-01-01 02:59:59 2038-01-01 02:59:59 3 2004-02-29 23:59:59 2004-02-29 23:59:59 4 2005-06-28 10:00:00 2005-06-28 10:00:00 5 @@ -1288,7 +1288,7 @@ WHERE v1.id IN (SELECT id FROM t1_values WHERE select_id = 136 OR select_id IS NULL) order by id; IFNULL(my_timestamp,'IS_NULL') my_timestamp id 0000-00-00 00:00:00 0000-00-00 00:00:00 1 -1970-01-01 03:00:01 1970-01-01 03:00:01 2 +1970-01-01 14:00:01 1970-01-01 14:00:01 2 2038-01-01 02:59:59 2038-01-01 02:59:59 3 2004-02-29 23:59:59 2004-02-29 23:59:59 4 2005-06-28 10:00:00 2005-06-28 10:00:00 5 @@ -1595,7 +1595,7 @@ WHERE select_id = 124 OR select_id IS NULL order by id; IF(my_timestamp IS NULL, 'IS NULL', 'IS NOT NULL') my_timestamp id IS NOT NULL 0000-00-00 00:00:00 1 -IS NOT NULL 1970-01-01 03:00:01 2 +IS NOT NULL 1970-01-01 14:00:01 2 IS NOT NULL 2038-01-01 02:59:59 3 IS NOT NULL 2004-02-29 23:59:59 4 IS NOT NULL 2005-06-28 10:00:00 5 @@ -1609,7 +1609,7 @@ WHERE select_id = 124 OR select_id IS NULL) order by id; IF(my_timestamp IS NULL, 'IS NULL', 'IS NOT NULL') my_timestamp id IS NOT NULL 0000-00-00 00:00:00 1 -IS NOT NULL 1970-01-01 03:00:01 2 +IS NOT NULL 1970-01-01 14:00:01 2 IS NOT NULL 2038-01-01 02:59:59 3 IS NOT NULL 2004-02-29 23:59:59 4 IS NOT NULL 2005-06-28 10:00:00 5 @@ -1936,7 +1936,7 @@ my_timestamp, id FROM t1_values WHERE select_id = 112 OR select_id IS NULL order by id; IF(my_timestamp, 'IS TRUE', 'IS NOT TRUE') my_timestamp id IS NOT TRUE 0000-00-00 00:00:00 1 -IS TRUE 1970-01-01 03:00:01 2 +IS TRUE 1970-01-01 14:00:01 2 IS TRUE 2038-01-01 02:59:59 3 IS TRUE 2004-02-29 23:59:59 4 IS TRUE 2005-06-28 10:00:00 5 @@ -1948,7 +1948,7 @@ WHERE v1.id IN (SELECT id FROM t1_values WHERE select_id = 112 OR select_id IS NULL) order by id; IF(my_timestamp, 'IS TRUE', 'IS NOT TRUE') my_timestamp id IS NOT TRUE 0000-00-00 00:00:00 1 -IS TRUE 1970-01-01 03:00:01 2 +IS TRUE 1970-01-01 14:00:01 2 IS TRUE 2038-01-01 02:59:59 3 IS TRUE 2004-02-29 23:59:59 4 IS TRUE 2005-06-28 10:00:00 5 @@ -2488,7 +2488,7 @@ my_timestamp, id FROM t1_values WHERE select_id = 92 OR select_id IS NULL order by id; CAST(my_timestamp AS UNSIGNED INTEGER) my_timestamp id 0 0000-00-00 00:00:00 1 -19700101030001 1970-01-01 03:00:01 2 +19700101140001 1970-01-01 14:00:01 2 20380101025959 2038-01-01 02:59:59 3 20040229235959 2004-02-29 23:59:59 4 20050628100000 2005-06-28 10:00:00 5 @@ -2500,7 +2500,7 @@ WHERE v1.id IN (SELECT id FROM t1_values WHERE select_id = 92 OR select_id IS NULL) order by id; CAST(my_timestamp AS UNSIGNED INTEGER) my_timestamp id 0 0000-00-00 00:00:00 1 -19700101030001 1970-01-01 03:00:01 2 +19700101140001 1970-01-01 14:00:01 2 20380101025959 2038-01-01 02:59:59 3 20040229235959 2004-02-29 23:59:59 4 20050628100000 2005-06-28 10:00:00 5 @@ -2866,7 +2866,7 @@ my_timestamp, id FROM t1_values WHERE select_id = 80 OR select_id IS NULL order by id; CAST(my_timestamp AS SIGNED INTEGER) my_timestamp id 0 0000-00-00 00:00:00 1 -19700101030001 1970-01-01 03:00:01 2 +19700101140001 1970-01-01 14:00:01 2 20380101025959 2038-01-01 02:59:59 3 20040229235959 2004-02-29 23:59:59 4 20050628100000 2005-06-28 10:00:00 5 @@ -2878,7 +2878,7 @@ WHERE v1.id IN (SELECT id FROM t1_values WHERE select_id = 80 OR select_id IS NULL) order by id; CAST(my_timestamp AS SIGNED INTEGER) my_timestamp id 0 0000-00-00 00:00:00 1 -19700101030001 1970-01-01 03:00:01 2 +19700101140001 1970-01-01 14:00:01 2 20380101025959 2038-01-01 02:59:59 3 20040229235959 2004-02-29 23:59:59 4 20050628100000 2005-06-28 10:00:00 5 @@ -3224,7 +3224,7 @@ my_timestamp, id FROM t1_values WHERE select_id = 68 OR select_id IS NULL order by id; CAST(my_timestamp AS DECIMAL(37,2)) my_timestamp id 0.00 0000-00-00 00:00:00 1 -19700101030001.00 1970-01-01 03:00:01 2 +19700101140001.00 1970-01-01 14:00:01 2 20380101025959.00 2038-01-01 02:59:59 3 20040229235959.00 2004-02-29 23:59:59 4 20050628100000.00 2005-06-28 10:00:00 5 @@ -3236,7 +3236,7 @@ WHERE v1.id IN (SELECT id FROM t1_values WHERE select_id = 68 OR select_id IS NULL) order by id; CAST(my_timestamp AS DECIMAL(37,2)) my_timestamp id 0.00 0000-00-00 00:00:00 1 -19700101030001.00 1970-01-01 03:00:01 2 +19700101140001.00 1970-01-01 14:00:01 2 20380101025959.00 2038-01-01 02:59:59 3 20040229235959.00 2004-02-29 23:59:59 4 20050628100000.00 2005-06-28 10:00:00 5 @@ -3616,7 +3616,7 @@ my_timestamp, id FROM t1_values WHERE select_id = 56 OR select_id IS NULL order by id; CAST(my_timestamp AS TIME) my_timestamp id 00:00:00 0000-00-00 00:00:00 1 -03:00:01 1970-01-01 03:00:01 2 +14:00:01 1970-01-01 14:00:01 2 02:59:59 2038-01-01 02:59:59 3 23:59:59 2004-02-29 23:59:59 4 10:00:00 2005-06-28 10:00:00 5 @@ -3628,7 +3628,7 @@ WHERE v1.id IN (SELECT id FROM t1_values WHERE select_id = 56 OR select_id IS NULL) order by id; CAST(my_timestamp AS TIME) my_timestamp id 00:00:00 0000-00-00 00:00:00 1 -03:00:01 1970-01-01 03:00:01 2 +14:00:01 1970-01-01 14:00:01 2 02:59:59 2038-01-01 02:59:59 3 23:59:59 2004-02-29 23:59:59 4 10:00:00 2005-06-28 10:00:00 5 @@ -3966,7 +3966,7 @@ my_timestamp, id FROM t1_values WHERE select_id = 45 OR select_id IS NULL order by id; CAST(my_timestamp AS DATETIME) my_timestamp id 0000-00-00 00:00:00 0000-00-00 00:00:00 1 -1970-01-01 03:00:01 1970-01-01 03:00:01 2 +1970-01-01 14:00:01 1970-01-01 14:00:01 2 2038-01-01 02:59:59 2038-01-01 02:59:59 3 2004-02-29 23:59:59 2004-02-29 23:59:59 4 2005-06-28 10:00:00 2005-06-28 10:00:00 5 @@ -3978,7 +3978,7 @@ WHERE v1.id IN (SELECT id FROM t1_values WHERE select_id = 45 OR select_id IS NULL) order by id; CAST(my_timestamp AS DATETIME) my_timestamp id 0000-00-00 00:00:00 0000-00-00 00:00:00 1 -1970-01-01 03:00:01 1970-01-01 03:00:01 2 +1970-01-01 14:00:01 1970-01-01 14:00:01 2 2038-01-01 02:59:59 2038-01-01 02:59:59 3 2004-02-29 23:59:59 2004-02-29 23:59:59 4 2005-06-28 10:00:00 2005-06-28 10:00:00 5 @@ -4328,7 +4328,7 @@ my_timestamp, id FROM t1_values WHERE select_id = 34 OR select_id IS NULL order by id; CAST(my_timestamp AS DATE) my_timestamp id 0000-00-00 0000-00-00 00:00:00 1 -1970-01-01 1970-01-01 03:00:01 2 +1970-01-01 1970-01-01 14:00:01 2 2038-01-01 2038-01-01 02:59:59 3 2004-02-29 2004-02-29 23:59:59 4 2005-06-28 2005-06-28 10:00:00 5 @@ -4340,7 +4340,7 @@ WHERE v1.id IN (SELECT id FROM t1_values WHERE select_id = 34 OR select_id IS NULL) order by id; CAST(my_timestamp AS DATE) my_timestamp id 0000-00-00 0000-00-00 00:00:00 1 -1970-01-01 1970-01-01 03:00:01 2 +1970-01-01 1970-01-01 14:00:01 2 2038-01-01 2038-01-01 02:59:59 3 2004-02-29 2004-02-29 23:59:59 4 2005-06-28 2005-06-28 10:00:00 5 @@ -4686,7 +4686,7 @@ my_timestamp, id FROM t1_values WHERE select_id = 23 OR select_id IS NULL order by id; CAST(my_timestamp AS CHAR) my_timestamp id 0000-00-00 00:00:00 0000-00-00 00:00:00 1 -1970-01-01 03:00:01 1970-01-01 03:00:01 2 +1970-01-01 14:00:01 1970-01-01 14:00:01 2 2038-01-01 02:59:59 2038-01-01 02:59:59 3 2004-02-29 23:59:59 2004-02-29 23:59:59 4 2005-06-28 10:00:00 2005-06-28 10:00:00 5 @@ -4698,7 +4698,7 @@ WHERE v1.id IN (SELECT id FROM t1_values WHERE select_id = 23 OR select_id IS NULL) order by id; CAST(my_timestamp AS CHAR) my_timestamp id 0000-00-00 00:00:00 0000-00-00 00:00:00 1 -1970-01-01 03:00:01 1970-01-01 03:00:01 2 +1970-01-01 14:00:01 1970-01-01 14:00:01 2 2038-01-01 02:59:59 2038-01-01 02:59:59 3 2004-02-29 23:59:59 2004-02-29 23:59:59 4 2005-06-28 10:00:00 2005-06-28 10:00:00 5 @@ -4998,7 +4998,7 @@ my_timestamp, id FROM t1_values WHERE select_id = 11 OR select_id IS NULL order by id; CAST(my_timestamp AS BINARY) my_timestamp id 0000-00-00 00:00:00 0000-00-00 00:00:00 1 -1970-01-01 03:00:01 1970-01-01 03:00:01 2 +1970-01-01 14:00:01 1970-01-01 14:00:01 2 2038-01-01 02:59:59 2038-01-01 02:59:59 3 2004-02-29 23:59:59 2004-02-29 23:59:59 4 2005-06-28 10:00:00 2005-06-28 10:00:00 5 @@ -5010,7 +5010,7 @@ WHERE v1.id IN (SELECT id FROM t1_values WHERE select_id = 11 OR select_id IS NULL) order by id; CAST(my_timestamp AS BINARY) my_timestamp id 0000-00-00 00:00:00 0000-00-00 00:00:00 1 -1970-01-01 03:00:01 1970-01-01 03:00:01 2 +1970-01-01 14:00:01 1970-01-01 14:00:01 2 2038-01-01 02:59:59 2038-01-01 02:59:59 3 2004-02-29 23:59:59 2004-02-29 23:59:59 4 2005-06-28 10:00:00 2005-06-28 10:00:00 5 diff --git a/mysql-test/suite/funcs_1/r/memory_func_view.result b/mysql-test/suite/funcs_1/r/memory_func_view.result index 03e4c647d6d..9fa90797497 100644 --- a/mysql-test/suite/funcs_1/r/memory_func_view.result +++ b/mysql-test/suite/funcs_1/r/memory_func_view.result @@ -29,7 +29,7 @@ my_binary_30 = '', my_varbinary_1000 = '', my_datetime = '0001-01-01 00:00:00', my_date = '0001-01-01', -my_timestamp = '1970-01-01 03:00:01', +my_timestamp = '1970-01-01 14:00:01', my_time = '-838:59:59', my_year = '1901', my_bigint = -9223372036854775808, @@ -1277,7 +1277,7 @@ my_timestamp, id FROM t1_values WHERE select_id = 136 OR select_id IS NULL order by id; IFNULL(my_timestamp,'IS_NULL') my_timestamp id 0000-00-00 00:00:00 0000-00-00 00:00:00 1 -1970-01-01 03:00:01 1970-01-01 03:00:01 2 +1970-01-01 14:00:01 1970-01-01 14:00:01 2 2038-01-01 02:59:59 2038-01-01 02:59:59 3 2004-02-29 23:59:59 2004-02-29 23:59:59 4 2005-06-28 10:00:00 2005-06-28 10:00:00 5 @@ -1289,7 +1289,7 @@ WHERE v1.id IN (SELECT id FROM t1_values WHERE select_id = 136 OR select_id IS NULL) order by id; IFNULL(my_timestamp,'IS_NULL') my_timestamp id 0000-00-00 00:00:00 0000-00-00 00:00:00 1 -1970-01-01 03:00:01 1970-01-01 03:00:01 2 +1970-01-01 14:00:01 1970-01-01 14:00:01 2 2038-01-01 02:59:59 2038-01-01 02:59:59 3 2004-02-29 23:59:59 2004-02-29 23:59:59 4 2005-06-28 10:00:00 2005-06-28 10:00:00 5 @@ -1596,7 +1596,7 @@ WHERE select_id = 124 OR select_id IS NULL order by id; IF(my_timestamp IS NULL, 'IS NULL', 'IS NOT NULL') my_timestamp id IS NOT NULL 0000-00-00 00:00:00 1 -IS NOT NULL 1970-01-01 03:00:01 2 +IS NOT NULL 1970-01-01 14:00:01 2 IS NOT NULL 2038-01-01 02:59:59 3 IS NOT NULL 2004-02-29 23:59:59 4 IS NOT NULL 2005-06-28 10:00:00 5 @@ -1610,7 +1610,7 @@ WHERE select_id = 124 OR select_id IS NULL) order by id; IF(my_timestamp IS NULL, 'IS NULL', 'IS NOT NULL') my_timestamp id IS NOT NULL 0000-00-00 00:00:00 1 -IS NOT NULL 1970-01-01 03:00:01 2 +IS NOT NULL 1970-01-01 14:00:01 2 IS NOT NULL 2038-01-01 02:59:59 3 IS NOT NULL 2004-02-29 23:59:59 4 IS NOT NULL 2005-06-28 10:00:00 5 @@ -1937,7 +1937,7 @@ my_timestamp, id FROM t1_values WHERE select_id = 112 OR select_id IS NULL order by id; IF(my_timestamp, 'IS TRUE', 'IS NOT TRUE') my_timestamp id IS NOT TRUE 0000-00-00 00:00:00 1 -IS TRUE 1970-01-01 03:00:01 2 +IS TRUE 1970-01-01 14:00:01 2 IS TRUE 2038-01-01 02:59:59 3 IS TRUE 2004-02-29 23:59:59 4 IS TRUE 2005-06-28 10:00:00 5 @@ -1949,7 +1949,7 @@ WHERE v1.id IN (SELECT id FROM t1_values WHERE select_id = 112 OR select_id IS NULL) order by id; IF(my_timestamp, 'IS TRUE', 'IS NOT TRUE') my_timestamp id IS NOT TRUE 0000-00-00 00:00:00 1 -IS TRUE 1970-01-01 03:00:01 2 +IS TRUE 1970-01-01 14:00:01 2 IS TRUE 2038-01-01 02:59:59 3 IS TRUE 2004-02-29 23:59:59 4 IS TRUE 2005-06-28 10:00:00 5 @@ -2489,7 +2489,7 @@ my_timestamp, id FROM t1_values WHERE select_id = 92 OR select_id IS NULL order by id; CAST(my_timestamp AS UNSIGNED INTEGER) my_timestamp id 0 0000-00-00 00:00:00 1 -19700101030001 1970-01-01 03:00:01 2 +19700101140001 1970-01-01 14:00:01 2 20380101025959 2038-01-01 02:59:59 3 20040229235959 2004-02-29 23:59:59 4 20050628100000 2005-06-28 10:00:00 5 @@ -2501,7 +2501,7 @@ WHERE v1.id IN (SELECT id FROM t1_values WHERE select_id = 92 OR select_id IS NULL) order by id; CAST(my_timestamp AS UNSIGNED INTEGER) my_timestamp id 0 0000-00-00 00:00:00 1 -19700101030001 1970-01-01 03:00:01 2 +19700101140001 1970-01-01 14:00:01 2 20380101025959 2038-01-01 02:59:59 3 20040229235959 2004-02-29 23:59:59 4 20050628100000 2005-06-28 10:00:00 5 @@ -2867,7 +2867,7 @@ my_timestamp, id FROM t1_values WHERE select_id = 80 OR select_id IS NULL order by id; CAST(my_timestamp AS SIGNED INTEGER) my_timestamp id 0 0000-00-00 00:00:00 1 -19700101030001 1970-01-01 03:00:01 2 +19700101140001 1970-01-01 14:00:01 2 20380101025959 2038-01-01 02:59:59 3 20040229235959 2004-02-29 23:59:59 4 20050628100000 2005-06-28 10:00:00 5 @@ -2879,7 +2879,7 @@ WHERE v1.id IN (SELECT id FROM t1_values WHERE select_id = 80 OR select_id IS NULL) order by id; CAST(my_timestamp AS SIGNED INTEGER) my_timestamp id 0 0000-00-00 00:00:00 1 -19700101030001 1970-01-01 03:00:01 2 +19700101140001 1970-01-01 14:00:01 2 20380101025959 2038-01-01 02:59:59 3 20040229235959 2004-02-29 23:59:59 4 20050628100000 2005-06-28 10:00:00 5 @@ -3225,7 +3225,7 @@ my_timestamp, id FROM t1_values WHERE select_id = 68 OR select_id IS NULL order by id; CAST(my_timestamp AS DECIMAL(37,2)) my_timestamp id 0.00 0000-00-00 00:00:00 1 -19700101030001.00 1970-01-01 03:00:01 2 +19700101140001.00 1970-01-01 14:00:01 2 20380101025959.00 2038-01-01 02:59:59 3 20040229235959.00 2004-02-29 23:59:59 4 20050628100000.00 2005-06-28 10:00:00 5 @@ -3237,7 +3237,7 @@ WHERE v1.id IN (SELECT id FROM t1_values WHERE select_id = 68 OR select_id IS NULL) order by id; CAST(my_timestamp AS DECIMAL(37,2)) my_timestamp id 0.00 0000-00-00 00:00:00 1 -19700101030001.00 1970-01-01 03:00:01 2 +19700101140001.00 1970-01-01 14:00:01 2 20380101025959.00 2038-01-01 02:59:59 3 20040229235959.00 2004-02-29 23:59:59 4 20050628100000.00 2005-06-28 10:00:00 5 @@ -3617,7 +3617,7 @@ my_timestamp, id FROM t1_values WHERE select_id = 56 OR select_id IS NULL order by id; CAST(my_timestamp AS TIME) my_timestamp id 00:00:00 0000-00-00 00:00:00 1 -03:00:01 1970-01-01 03:00:01 2 +14:00:01 1970-01-01 14:00:01 2 02:59:59 2038-01-01 02:59:59 3 23:59:59 2004-02-29 23:59:59 4 10:00:00 2005-06-28 10:00:00 5 @@ -3629,7 +3629,7 @@ WHERE v1.id IN (SELECT id FROM t1_values WHERE select_id = 56 OR select_id IS NULL) order by id; CAST(my_timestamp AS TIME) my_timestamp id 00:00:00 0000-00-00 00:00:00 1 -03:00:01 1970-01-01 03:00:01 2 +14:00:01 1970-01-01 14:00:01 2 02:59:59 2038-01-01 02:59:59 3 23:59:59 2004-02-29 23:59:59 4 10:00:00 2005-06-28 10:00:00 5 @@ -3967,7 +3967,7 @@ my_timestamp, id FROM t1_values WHERE select_id = 45 OR select_id IS NULL order by id; CAST(my_timestamp AS DATETIME) my_timestamp id 0000-00-00 00:00:00 0000-00-00 00:00:00 1 -1970-01-01 03:00:01 1970-01-01 03:00:01 2 +1970-01-01 14:00:01 1970-01-01 14:00:01 2 2038-01-01 02:59:59 2038-01-01 02:59:59 3 2004-02-29 23:59:59 2004-02-29 23:59:59 4 2005-06-28 10:00:00 2005-06-28 10:00:00 5 @@ -3979,7 +3979,7 @@ WHERE v1.id IN (SELECT id FROM t1_values WHERE select_id = 45 OR select_id IS NULL) order by id; CAST(my_timestamp AS DATETIME) my_timestamp id 0000-00-00 00:00:00 0000-00-00 00:00:00 1 -1970-01-01 03:00:01 1970-01-01 03:00:01 2 +1970-01-01 14:00:01 1970-01-01 14:00:01 2 2038-01-01 02:59:59 2038-01-01 02:59:59 3 2004-02-29 23:59:59 2004-02-29 23:59:59 4 2005-06-28 10:00:00 2005-06-28 10:00:00 5 @@ -4329,7 +4329,7 @@ my_timestamp, id FROM t1_values WHERE select_id = 34 OR select_id IS NULL order by id; CAST(my_timestamp AS DATE) my_timestamp id 0000-00-00 0000-00-00 00:00:00 1 -1970-01-01 1970-01-01 03:00:01 2 +1970-01-01 1970-01-01 14:00:01 2 2038-01-01 2038-01-01 02:59:59 3 2004-02-29 2004-02-29 23:59:59 4 2005-06-28 2005-06-28 10:00:00 5 @@ -4341,7 +4341,7 @@ WHERE v1.id IN (SELECT id FROM t1_values WHERE select_id = 34 OR select_id IS NULL) order by id; CAST(my_timestamp AS DATE) my_timestamp id 0000-00-00 0000-00-00 00:00:00 1 -1970-01-01 1970-01-01 03:00:01 2 +1970-01-01 1970-01-01 14:00:01 2 2038-01-01 2038-01-01 02:59:59 3 2004-02-29 2004-02-29 23:59:59 4 2005-06-28 2005-06-28 10:00:00 5 @@ -4687,7 +4687,7 @@ my_timestamp, id FROM t1_values WHERE select_id = 23 OR select_id IS NULL order by id; CAST(my_timestamp AS CHAR) my_timestamp id 0000-00-00 00:00:00 0000-00-00 00:00:00 1 -1970-01-01 03:00:01 1970-01-01 03:00:01 2 +1970-01-01 14:00:01 1970-01-01 14:00:01 2 2038-01-01 02:59:59 2038-01-01 02:59:59 3 2004-02-29 23:59:59 2004-02-29 23:59:59 4 2005-06-28 10:00:00 2005-06-28 10:00:00 5 @@ -4699,7 +4699,7 @@ WHERE v1.id IN (SELECT id FROM t1_values WHERE select_id = 23 OR select_id IS NULL) order by id; CAST(my_timestamp AS CHAR) my_timestamp id 0000-00-00 00:00:00 0000-00-00 00:00:00 1 -1970-01-01 03:00:01 1970-01-01 03:00:01 2 +1970-01-01 14:00:01 1970-01-01 14:00:01 2 2038-01-01 02:59:59 2038-01-01 02:59:59 3 2004-02-29 23:59:59 2004-02-29 23:59:59 4 2005-06-28 10:00:00 2005-06-28 10:00:00 5 @@ -4999,7 +4999,7 @@ my_timestamp, id FROM t1_values WHERE select_id = 11 OR select_id IS NULL order by id; CAST(my_timestamp AS BINARY) my_timestamp id 0000-00-00 00:00:00 0000-00-00 00:00:00 1 -1970-01-01 03:00:01 1970-01-01 03:00:01 2 +1970-01-01 14:00:01 1970-01-01 14:00:01 2 2038-01-01 02:59:59 2038-01-01 02:59:59 3 2004-02-29 23:59:59 2004-02-29 23:59:59 4 2005-06-28 10:00:00 2005-06-28 10:00:00 5 @@ -5011,7 +5011,7 @@ WHERE v1.id IN (SELECT id FROM t1_values WHERE select_id = 11 OR select_id IS NULL) order by id; CAST(my_timestamp AS BINARY) my_timestamp id 0000-00-00 00:00:00 0000-00-00 00:00:00 1 -1970-01-01 03:00:01 1970-01-01 03:00:01 2 +1970-01-01 14:00:01 1970-01-01 14:00:01 2 2038-01-01 02:59:59 2038-01-01 02:59:59 3 2004-02-29 23:59:59 2004-02-29 23:59:59 4 2005-06-28 10:00:00 2005-06-28 10:00:00 5 diff --git a/mysql-test/suite/funcs_1/r/myisam_func_view.result b/mysql-test/suite/funcs_1/r/myisam_func_view.result index 03e4c647d6d..9fa90797497 100644 --- a/mysql-test/suite/funcs_1/r/myisam_func_view.result +++ b/mysql-test/suite/funcs_1/r/myisam_func_view.result @@ -29,7 +29,7 @@ my_binary_30 = '', my_varbinary_1000 = '', my_datetime = '0001-01-01 00:00:00', my_date = '0001-01-01', -my_timestamp = '1970-01-01 03:00:01', +my_timestamp = '1970-01-01 14:00:01', my_time = '-838:59:59', my_year = '1901', my_bigint = -9223372036854775808, @@ -1277,7 +1277,7 @@ my_timestamp, id FROM t1_values WHERE select_id = 136 OR select_id IS NULL order by id; IFNULL(my_timestamp,'IS_NULL') my_timestamp id 0000-00-00 00:00:00 0000-00-00 00:00:00 1 -1970-01-01 03:00:01 1970-01-01 03:00:01 2 +1970-01-01 14:00:01 1970-01-01 14:00:01 2 2038-01-01 02:59:59 2038-01-01 02:59:59 3 2004-02-29 23:59:59 2004-02-29 23:59:59 4 2005-06-28 10:00:00 2005-06-28 10:00:00 5 @@ -1289,7 +1289,7 @@ WHERE v1.id IN (SELECT id FROM t1_values WHERE select_id = 136 OR select_id IS NULL) order by id; IFNULL(my_timestamp,'IS_NULL') my_timestamp id 0000-00-00 00:00:00 0000-00-00 00:00:00 1 -1970-01-01 03:00:01 1970-01-01 03:00:01 2 +1970-01-01 14:00:01 1970-01-01 14:00:01 2 2038-01-01 02:59:59 2038-01-01 02:59:59 3 2004-02-29 23:59:59 2004-02-29 23:59:59 4 2005-06-28 10:00:00 2005-06-28 10:00:00 5 @@ -1596,7 +1596,7 @@ WHERE select_id = 124 OR select_id IS NULL order by id; IF(my_timestamp IS NULL, 'IS NULL', 'IS NOT NULL') my_timestamp id IS NOT NULL 0000-00-00 00:00:00 1 -IS NOT NULL 1970-01-01 03:00:01 2 +IS NOT NULL 1970-01-01 14:00:01 2 IS NOT NULL 2038-01-01 02:59:59 3 IS NOT NULL 2004-02-29 23:59:59 4 IS NOT NULL 2005-06-28 10:00:00 5 @@ -1610,7 +1610,7 @@ WHERE select_id = 124 OR select_id IS NULL) order by id; IF(my_timestamp IS NULL, 'IS NULL', 'IS NOT NULL') my_timestamp id IS NOT NULL 0000-00-00 00:00:00 1 -IS NOT NULL 1970-01-01 03:00:01 2 +IS NOT NULL 1970-01-01 14:00:01 2 IS NOT NULL 2038-01-01 02:59:59 3 IS NOT NULL 2004-02-29 23:59:59 4 IS NOT NULL 2005-06-28 10:00:00 5 @@ -1937,7 +1937,7 @@ my_timestamp, id FROM t1_values WHERE select_id = 112 OR select_id IS NULL order by id; IF(my_timestamp, 'IS TRUE', 'IS NOT TRUE') my_timestamp id IS NOT TRUE 0000-00-00 00:00:00 1 -IS TRUE 1970-01-01 03:00:01 2 +IS TRUE 1970-01-01 14:00:01 2 IS TRUE 2038-01-01 02:59:59 3 IS TRUE 2004-02-29 23:59:59 4 IS TRUE 2005-06-28 10:00:00 5 @@ -1949,7 +1949,7 @@ WHERE v1.id IN (SELECT id FROM t1_values WHERE select_id = 112 OR select_id IS NULL) order by id; IF(my_timestamp, 'IS TRUE', 'IS NOT TRUE') my_timestamp id IS NOT TRUE 0000-00-00 00:00:00 1 -IS TRUE 1970-01-01 03:00:01 2 +IS TRUE 1970-01-01 14:00:01 2 IS TRUE 2038-01-01 02:59:59 3 IS TRUE 2004-02-29 23:59:59 4 IS TRUE 2005-06-28 10:00:00 5 @@ -2489,7 +2489,7 @@ my_timestamp, id FROM t1_values WHERE select_id = 92 OR select_id IS NULL order by id; CAST(my_timestamp AS UNSIGNED INTEGER) my_timestamp id 0 0000-00-00 00:00:00 1 -19700101030001 1970-01-01 03:00:01 2 +19700101140001 1970-01-01 14:00:01 2 20380101025959 2038-01-01 02:59:59 3 20040229235959 2004-02-29 23:59:59 4 20050628100000 2005-06-28 10:00:00 5 @@ -2501,7 +2501,7 @@ WHERE v1.id IN (SELECT id FROM t1_values WHERE select_id = 92 OR select_id IS NULL) order by id; CAST(my_timestamp AS UNSIGNED INTEGER) my_timestamp id 0 0000-00-00 00:00:00 1 -19700101030001 1970-01-01 03:00:01 2 +19700101140001 1970-01-01 14:00:01 2 20380101025959 2038-01-01 02:59:59 3 20040229235959 2004-02-29 23:59:59 4 20050628100000 2005-06-28 10:00:00 5 @@ -2867,7 +2867,7 @@ my_timestamp, id FROM t1_values WHERE select_id = 80 OR select_id IS NULL order by id; CAST(my_timestamp AS SIGNED INTEGER) my_timestamp id 0 0000-00-00 00:00:00 1 -19700101030001 1970-01-01 03:00:01 2 +19700101140001 1970-01-01 14:00:01 2 20380101025959 2038-01-01 02:59:59 3 20040229235959 2004-02-29 23:59:59 4 20050628100000 2005-06-28 10:00:00 5 @@ -2879,7 +2879,7 @@ WHERE v1.id IN (SELECT id FROM t1_values WHERE select_id = 80 OR select_id IS NULL) order by id; CAST(my_timestamp AS SIGNED INTEGER) my_timestamp id 0 0000-00-00 00:00:00 1 -19700101030001 1970-01-01 03:00:01 2 +19700101140001 1970-01-01 14:00:01 2 20380101025959 2038-01-01 02:59:59 3 20040229235959 2004-02-29 23:59:59 4 20050628100000 2005-06-28 10:00:00 5 @@ -3225,7 +3225,7 @@ my_timestamp, id FROM t1_values WHERE select_id = 68 OR select_id IS NULL order by id; CAST(my_timestamp AS DECIMAL(37,2)) my_timestamp id 0.00 0000-00-00 00:00:00 1 -19700101030001.00 1970-01-01 03:00:01 2 +19700101140001.00 1970-01-01 14:00:01 2 20380101025959.00 2038-01-01 02:59:59 3 20040229235959.00 2004-02-29 23:59:59 4 20050628100000.00 2005-06-28 10:00:00 5 @@ -3237,7 +3237,7 @@ WHERE v1.id IN (SELECT id FROM t1_values WHERE select_id = 68 OR select_id IS NULL) order by id; CAST(my_timestamp AS DECIMAL(37,2)) my_timestamp id 0.00 0000-00-00 00:00:00 1 -19700101030001.00 1970-01-01 03:00:01 2 +19700101140001.00 1970-01-01 14:00:01 2 20380101025959.00 2038-01-01 02:59:59 3 20040229235959.00 2004-02-29 23:59:59 4 20050628100000.00 2005-06-28 10:00:00 5 @@ -3617,7 +3617,7 @@ my_timestamp, id FROM t1_values WHERE select_id = 56 OR select_id IS NULL order by id; CAST(my_timestamp AS TIME) my_timestamp id 00:00:00 0000-00-00 00:00:00 1 -03:00:01 1970-01-01 03:00:01 2 +14:00:01 1970-01-01 14:00:01 2 02:59:59 2038-01-01 02:59:59 3 23:59:59 2004-02-29 23:59:59 4 10:00:00 2005-06-28 10:00:00 5 @@ -3629,7 +3629,7 @@ WHERE v1.id IN (SELECT id FROM t1_values WHERE select_id = 56 OR select_id IS NULL) order by id; CAST(my_timestamp AS TIME) my_timestamp id 00:00:00 0000-00-00 00:00:00 1 -03:00:01 1970-01-01 03:00:01 2 +14:00:01 1970-01-01 14:00:01 2 02:59:59 2038-01-01 02:59:59 3 23:59:59 2004-02-29 23:59:59 4 10:00:00 2005-06-28 10:00:00 5 @@ -3967,7 +3967,7 @@ my_timestamp, id FROM t1_values WHERE select_id = 45 OR select_id IS NULL order by id; CAST(my_timestamp AS DATETIME) my_timestamp id 0000-00-00 00:00:00 0000-00-00 00:00:00 1 -1970-01-01 03:00:01 1970-01-01 03:00:01 2 +1970-01-01 14:00:01 1970-01-01 14:00:01 2 2038-01-01 02:59:59 2038-01-01 02:59:59 3 2004-02-29 23:59:59 2004-02-29 23:59:59 4 2005-06-28 10:00:00 2005-06-28 10:00:00 5 @@ -3979,7 +3979,7 @@ WHERE v1.id IN (SELECT id FROM t1_values WHERE select_id = 45 OR select_id IS NULL) order by id; CAST(my_timestamp AS DATETIME) my_timestamp id 0000-00-00 00:00:00 0000-00-00 00:00:00 1 -1970-01-01 03:00:01 1970-01-01 03:00:01 2 +1970-01-01 14:00:01 1970-01-01 14:00:01 2 2038-01-01 02:59:59 2038-01-01 02:59:59 3 2004-02-29 23:59:59 2004-02-29 23:59:59 4 2005-06-28 10:00:00 2005-06-28 10:00:00 5 @@ -4329,7 +4329,7 @@ my_timestamp, id FROM t1_values WHERE select_id = 34 OR select_id IS NULL order by id; CAST(my_timestamp AS DATE) my_timestamp id 0000-00-00 0000-00-00 00:00:00 1 -1970-01-01 1970-01-01 03:00:01 2 +1970-01-01 1970-01-01 14:00:01 2 2038-01-01 2038-01-01 02:59:59 3 2004-02-29 2004-02-29 23:59:59 4 2005-06-28 2005-06-28 10:00:00 5 @@ -4341,7 +4341,7 @@ WHERE v1.id IN (SELECT id FROM t1_values WHERE select_id = 34 OR select_id IS NULL) order by id; CAST(my_timestamp AS DATE) my_timestamp id 0000-00-00 0000-00-00 00:00:00 1 -1970-01-01 1970-01-01 03:00:01 2 +1970-01-01 1970-01-01 14:00:01 2 2038-01-01 2038-01-01 02:59:59 3 2004-02-29 2004-02-29 23:59:59 4 2005-06-28 2005-06-28 10:00:00 5 @@ -4687,7 +4687,7 @@ my_timestamp, id FROM t1_values WHERE select_id = 23 OR select_id IS NULL order by id; CAST(my_timestamp AS CHAR) my_timestamp id 0000-00-00 00:00:00 0000-00-00 00:00:00 1 -1970-01-01 03:00:01 1970-01-01 03:00:01 2 +1970-01-01 14:00:01 1970-01-01 14:00:01 2 2038-01-01 02:59:59 2038-01-01 02:59:59 3 2004-02-29 23:59:59 2004-02-29 23:59:59 4 2005-06-28 10:00:00 2005-06-28 10:00:00 5 @@ -4699,7 +4699,7 @@ WHERE v1.id IN (SELECT id FROM t1_values WHERE select_id = 23 OR select_id IS NULL) order by id; CAST(my_timestamp AS CHAR) my_timestamp id 0000-00-00 00:00:00 0000-00-00 00:00:00 1 -1970-01-01 03:00:01 1970-01-01 03:00:01 2 +1970-01-01 14:00:01 1970-01-01 14:00:01 2 2038-01-01 02:59:59 2038-01-01 02:59:59 3 2004-02-29 23:59:59 2004-02-29 23:59:59 4 2005-06-28 10:00:00 2005-06-28 10:00:00 5 @@ -4999,7 +4999,7 @@ my_timestamp, id FROM t1_values WHERE select_id = 11 OR select_id IS NULL order by id; CAST(my_timestamp AS BINARY) my_timestamp id 0000-00-00 00:00:00 0000-00-00 00:00:00 1 -1970-01-01 03:00:01 1970-01-01 03:00:01 2 +1970-01-01 14:00:01 1970-01-01 14:00:01 2 2038-01-01 02:59:59 2038-01-01 02:59:59 3 2004-02-29 23:59:59 2004-02-29 23:59:59 4 2005-06-28 10:00:00 2005-06-28 10:00:00 5 @@ -5011,7 +5011,7 @@ WHERE v1.id IN (SELECT id FROM t1_values WHERE select_id = 11 OR select_id IS NULL) order by id; CAST(my_timestamp AS BINARY) my_timestamp id 0000-00-00 00:00:00 0000-00-00 00:00:00 1 -1970-01-01 03:00:01 1970-01-01 03:00:01 2 +1970-01-01 14:00:01 1970-01-01 14:00:01 2 2038-01-01 02:59:59 2038-01-01 02:59:59 3 2004-02-29 23:59:59 2004-02-29 23:59:59 4 2005-06-28 10:00:00 2005-06-28 10:00:00 5 diff --git a/mysql-test/suite/funcs_1/views/func_view.inc b/mysql-test/suite/funcs_1/views/func_view.inc index 660efde8927..1dba96f6901 100644 --- a/mysql-test/suite/funcs_1/views/func_view.inc +++ b/mysql-test/suite/funcs_1/views/func_view.inc @@ -247,7 +247,7 @@ INSERT INTO t1_values SET my_varbinary_1000 = '', my_datetime = '0001-01-01 00:00:00', my_date = '0001-01-01', - my_timestamp = '1970-01-01 03:00:01', + my_timestamp = '1970-01-01 14:00:01', my_time = '-838:59:59', my_year = '1901', my_bigint = -9223372036854775808,