1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix func_time.test to be independent from the system time zone

Browse Source
This commit is contained in:
Sergei Golubchik 2014-08-01 12:04:55 +02:00
parent 5b452ae027
commit 681fbcaf92
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mysql-test/r/func_time.result
View File

@ -2004,6 +2004,7 @@ a
2000-02-23 2000-02-23
2005-05-04 2005-05-04
DROP TABLE t1; DROP TABLE t1;
SET TIME_ZONE='+02:00';
# #
# MDEV-6302 Wrong result set when using GROUP BY FROM_UNIXTIME(...)+0 # MDEV-6302 Wrong result set when using GROUP BY FROM_UNIXTIME(...)+0
# #
@ -2011,8 +2012,8 @@ CREATE TABLE t1 (a DATE);
INSERT INTO t1 VALUES ('2005-05-04'),('2000-02-23'); INSERT INTO t1 VALUES ('2005-05-04'),('2000-02-23');
SELECT a, FROM_UNIXTIME(CONCAT(a,'10')) AS f1, FROM_UNIXTIME(CONCAT(a,'10'))+0 AS f2 FROM t1; SELECT a, FROM_UNIXTIME(CONCAT(a,'10')) AS f1, FROM_UNIXTIME(CONCAT(a,'10'))+0 AS f2 FROM t1;
a f1 f2 a f1 f2
2005-05-04 1970-01-01 03:33:25 19700101033325.000000 2005-05-04 1970-01-01 02:33:25 19700101023325.000000
2000-02-23 1970-01-01 03:33:20 19700101033320.000000 2000-02-23 1970-01-01 02:33:20 19700101023320.000000
SELECT * FROM t1 GROUP BY FROM_UNIXTIME(CONCAT(a,'10'))+0; SELECT * FROM t1 GROUP BY FROM_UNIXTIME(CONCAT(a,'10'))+0;
a a
2000-02-23 2000-02-23
@ -2046,7 +2047,6 @@ DROP TABLE t1,t2;
# #
# MDEV-4635 Crash in UNIX_TIMESTAMP(STR_TO_DATE('2020','%Y')) # MDEV-4635 Crash in UNIX_TIMESTAMP(STR_TO_DATE('2020','%Y'))
# #
SET TIME_ZONE='+02:00';
SELECT UNIX_TIMESTAMP(STR_TO_DATE('2020','%Y')); SELECT UNIX_TIMESTAMP(STR_TO_DATE('2020','%Y'));
UNIX_TIMESTAMP(STR_TO_DATE('2020','%Y')) UNIX_TIMESTAMP(STR_TO_DATE('2020','%Y'))
NULL NULL

4
mysql-test/t/func_time.test
View File

@ -1212,6 +1212,7 @@ SELECT * FROM t1 GROUP BY @a:=(FROM_UNIXTIME(concat(a,'10'))*1);
DROP TABLE t1; DROP TABLE t1;
SET TIME_ZONE='+02:00';
--echo # --echo #
--echo # MDEV-6302 Wrong result set when using GROUP BY FROM_UNIXTIME(...)+0 --echo # MDEV-6302 Wrong result set when using GROUP BY FROM_UNIXTIME(...)+0
@ -1239,10 +1240,9 @@ DROP TABLE t1,t2;
--echo # --echo #
--echo # MDEV-4635 Crash in UNIX_TIMESTAMP(STR_TO_DATE('2020','%Y')) --echo # MDEV-4635 Crash in UNIX_TIMESTAMP(STR_TO_DATE('2020','%Y'))
--echo # --echo #
SET TIME_ZONE='+02:00';
SELECT UNIX_TIMESTAMP(STR_TO_DATE('2020','%Y')); SELECT UNIX_TIMESTAMP(STR_TO_DATE('2020','%Y'));
SET TIME_ZONE=DEFAULT;
SET TIME_ZONE=DEFAULT;
--echo # --echo #
--echo # MDEV-4863 COALESCE(time_or_datetime) returns wrong results in numeric context --echo # MDEV-4863 COALESCE(time_or_datetime) returns wrong results in numeric context