diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2010-11-29 19:47:32 +0300 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2010-11-29 19:47:32 +0300 |
| commit | f2abf5f6b14a9b9cb62f0f90ec38464e42f0004f (patch) | |
| tree | 1d97d51b2fde17918affd49b4d432fe2d3632a54 /mysql-test/suite/optimizer_unfixed_bugs | |
| parent | d1afc20e137984f1e6edd225be6da106b008da52 (diff) | |
| download | mariadb-git-f2abf5f6b14a9b9cb62f0f90ec38464e42f0004f.tar.gz | |
Make suite/optimizer_unfixed_bugs/t/bug43617.test work in any timezone.
Diffstat (limited to 'mysql-test/suite/optimizer_unfixed_bugs')
| -rw-r--r-- | mysql-test/suite/optimizer_unfixed_bugs/r/bug43617.result | 3 | ||||
| -rw-r--r-- | mysql-test/suite/optimizer_unfixed_bugs/t/bug43617.test | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/mysql-test/suite/optimizer_unfixed_bugs/r/bug43617.result b/mysql-test/suite/optimizer_unfixed_bugs/r/bug43617.result index a03306fa69b..185e7a4faa4 100644 --- a/mysql-test/suite/optimizer_unfixed_bugs/r/bug43617.result +++ b/mysql-test/suite/optimizer_unfixed_bugs/r/bug43617.result @@ -1,4 +1,6 @@ set storage_engine=innodb; +set @save_time_zone= @@time_zone; +set time_zone='+03:00'; set session debug="+d,optimizer_innodb_icp"; CREATE TABLE t1(c1 TIMESTAMP NOT NULL, c2 TIMESTAMP NULL, c3 DATE, c4 DATETIME, PRIMARY KEY(c1), UNIQUE INDEX(c2)); INSERT INTO t1 VALUES('98-12-31 11:30:45','98.12.31 11+30+45','98-12-31 11:30:45','98.12.31 11+30+45'),('98/12/30 11*30*45','98@12@30 11^30^45','98/12/30 11*30*45','98@12@30 11^30^45'),('98-12-29','98.12.29','98-12-29','98.12.29'),('98/12/28','98@12@28','98/12/28','98@12@28'); @@ -95,3 +97,4 @@ SELECT * FROM t1 WHERE c2 IN ('1971-01-01 00:00:01','2038-01-09 03:14:07') ORDER c1 c2 c3 c4 2038-01-09 03:14:07 2038-01-09 03:14:07 2009-01-05 2009-01-06 00:00:00 DROP TABLE t1; +set time_zone= @save_time_zone; diff --git a/mysql-test/suite/optimizer_unfixed_bugs/t/bug43617.test b/mysql-test/suite/optimizer_unfixed_bugs/t/bug43617.test index 6446ce36f5d..103aa224d46 100644 --- a/mysql-test/suite/optimizer_unfixed_bugs/t/bug43617.test +++ b/mysql-test/suite/optimizer_unfixed_bugs/t/bug43617.test @@ -4,7 +4,8 @@ --source include/have_innodb.inc set storage_engine=innodb; - +set @save_time_zone= @@time_zone; +set time_zone='+03:00'; set session debug="+d,optimizer_innodb_icp"; ######## Running INSERT tests for TIMESTAMP ######## @@ -81,3 +82,5 @@ SELECT * FROM t1 WHERE c2 IN ('1971-01-01 00:00:01','2038-01-09 03:14:07') ORDER SELECT * FROM t1 WHERE c2 IN ('1971-01-01 00:00:01','2038-01-09 03:14:07') ORDER BY c2 DESC LIMIT 2; DROP TABLE t1; +set time_zone= @save_time_zone; + |