diff options
author | Oleksandr Byelkin <sanja@mariadb.com> | 2019-05-19 20:55:37 +0200 |
---|---|---|
committer | Oleksandr Byelkin <sanja@mariadb.com> | 2019-05-19 20:55:37 +0200 |
commit | c07325f932abef2032b2e56532f6cb615e2a1161 (patch) | |
tree | 754ca158e45ebc014e5cbeaf4c3e7581f9575d76 /mysql-test/main/timezone2.result | |
parent | 7f8187bc432f79afe4c0549d68845a68e6c159ab (diff) | |
parent | 2ae83affef5a4d89f38272db31a400f968279a7a (diff) | |
download | mariadb-git-c07325f932abef2032b2e56532f6cb615e2a1161.tar.gz |
Merge branch '10.3' into 10.4
Diffstat (limited to 'mysql-test/main/timezone2.result')
-rw-r--r-- | mysql-test/main/timezone2.result | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/mysql-test/main/timezone2.result b/mysql-test/main/timezone2.result index dd137045d1a..cf3c6e01e25 100644 --- a/mysql-test/main/timezone2.result +++ b/mysql-test/main/timezone2.result @@ -333,6 +333,39 @@ NULL # End of 5.3 tests # # +# Start of 10.1 tests +# +# +# MDEV-11895 NO_ZERO_DATE affects timestamp values without any warnings +# +SET sql_mode = ''; +CREATE TABLE t1 (a TIMESTAMP NULL) ENGINE = MyISAM; +CREATE TABLE t2 (a TIMESTAMP NULL) ENGINE = MyISAM; +CREATE TABLE t3 (a TIMESTAMP NULL) ENGINE = MyISAM; +SET @@session.time_zone = 'UTC'; +INSERT INTO t1 VALUES ('2011-10-29 23:00:00'); +INSERT INTO t1 VALUES ('2011-10-29 23:00:01'); +INSERT INTO t1 VALUES ('2011-10-29 23:59:59'); +SET @@session.time_zone = 'Europe/Moscow'; +SET sql_mode='NO_ZERO_DATE'; +INSERT INTO t2 SELECT * FROM t1; +SET sql_mode=''; +INSERT INTO t3 SELECT * FROM t1; +SELECT UNIX_TIMESTAMP(a), a FROM t2; +UNIX_TIMESTAMP(a) a +1319929200 2011-10-30 02:00:00 +1319929201 2011-10-30 02:00:01 +1319932799 2011-10-30 02:59:59 +SELECT UNIX_TIMESTAMP(a), a FROM t3; +UNIX_TIMESTAMP(a) a +1319929200 2011-10-30 02:00:00 +1319929201 2011-10-30 02:00:01 +1319932799 2011-10-30 02:59:59 +DROP TABLE t1, t2, t3; +# +# End of 10.1 tests +# +# # Start of 10.4 tests # # |