mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
#19409: Test 'func_timestamp' fails on Windows x64
- The setting of "ENV{'TZ'}" doesn't affect the timezone used by MySQL Server on Windows. - Explicitly set timezone in test cases before doing UTC/localtime conversions so tests produce deterministic results mysql-test/r/func_timestamp.result: Update test results mysql-test/r/type_timestamp.result: Update test results mysql-test/t/func_timestamp.test: Specifically set timezone to make tests that do localtime/UTC conversions deterministic mysql-test/t/type_timestamp.test: Specifically set timezone to make tests that do localtime/UTC conversions deterministic
This commit is contained in:
@ -1,4 +1,5 @@
|
|||||||
drop table if exists t1;
|
drop table if exists t1;
|
||||||
|
set time_zone="+03:00";
|
||||||
create table t1 (Zeit time, Tag tinyint not null, Monat tinyint not null,
|
create table t1 (Zeit time, Tag tinyint not null, Monat tinyint not null,
|
||||||
Jahr smallint not null, index(Tag), index(Monat), index(Jahr) );
|
Jahr smallint not null, index(Tag), index(Monat), index(Jahr) );
|
||||||
insert into t1 values ("09:26:00",16,9,1998),("09:26:00",16,9,1998);
|
insert into t1 values ("09:26:00",16,9,1998),("09:26:00",16,9,1998);
|
||||||
@ -9,3 +10,4 @@ Date Unix
|
|||||||
1998-9-16 09:26:00 905927160
|
1998-9-16 09:26:00 905927160
|
||||||
1998-9-16 09:26:00 905927160
|
1998-9-16 09:26:00 905927160
|
||||||
drop table t1;
|
drop table t1;
|
||||||
|
set time_zone= @@global.time_zone;
|
||||||
|
@ -1,4 +1,5 @@
|
|||||||
drop table if exists t1,t2;
|
drop table if exists t1,t2;
|
||||||
|
set time_zone="+03:00";
|
||||||
CREATE TABLE t1 (a int, t timestamp);
|
CREATE TABLE t1 (a int, t timestamp);
|
||||||
CREATE TABLE t2 (a int, t datetime);
|
CREATE TABLE t2 (a int, t datetime);
|
||||||
SET TIMESTAMP=1234;
|
SET TIMESTAMP=1234;
|
||||||
@ -491,3 +492,4 @@ a b c
|
|||||||
5 NULL 2001-09-09 04:46:59
|
5 NULL 2001-09-09 04:46:59
|
||||||
6 NULL 2006-06-06 06:06:06
|
6 NULL 2006-06-06 06:06:06
|
||||||
drop table t1;
|
drop table t1;
|
||||||
|
set time_zone= @@global.time_zone;
|
||||||
|
@ -6,6 +6,9 @@
|
|||||||
drop table if exists t1;
|
drop table if exists t1;
|
||||||
--enable_warnings
|
--enable_warnings
|
||||||
|
|
||||||
|
# Set timezone to GMT-3, to make it possible to use "interval 3 hour"
|
||||||
|
set time_zone="+03:00";
|
||||||
|
|
||||||
create table t1 (Zeit time, Tag tinyint not null, Monat tinyint not null,
|
create table t1 (Zeit time, Tag tinyint not null, Monat tinyint not null,
|
||||||
Jahr smallint not null, index(Tag), index(Monat), index(Jahr) );
|
Jahr smallint not null, index(Tag), index(Monat), index(Jahr) );
|
||||||
insert into t1 values ("09:26:00",16,9,1998),("09:26:00",16,9,1998);
|
insert into t1 values ("09:26:00",16,9,1998),("09:26:00",16,9,1998);
|
||||||
@ -15,3 +18,6 @@ FROM t1;
|
|||||||
drop table t1;
|
drop table t1;
|
||||||
|
|
||||||
# End of 4.1 tests
|
# End of 4.1 tests
|
||||||
|
|
||||||
|
# Restore timezone to default
|
||||||
|
set time_zone= @@global.time_zone;
|
||||||
|
@ -6,6 +6,9 @@
|
|||||||
drop table if exists t1,t2;
|
drop table if exists t1,t2;
|
||||||
--enable_warnings
|
--enable_warnings
|
||||||
|
|
||||||
|
# Set timezone to GMT-3, to make it possible to use "interval 3 hour"
|
||||||
|
set time_zone="+03:00";
|
||||||
|
|
||||||
CREATE TABLE t1 (a int, t timestamp);
|
CREATE TABLE t1 (a int, t timestamp);
|
||||||
CREATE TABLE t2 (a int, t datetime);
|
CREATE TABLE t2 (a int, t datetime);
|
||||||
SET TIMESTAMP=1234;
|
SET TIMESTAMP=1234;
|
||||||
@ -322,3 +325,6 @@ select * from t1;
|
|||||||
drop table t1;
|
drop table t1;
|
||||||
|
|
||||||
# End of 4.1 tests
|
# End of 4.1 tests
|
||||||
|
|
||||||
|
# Restore timezone to default
|
||||||
|
set time_zone= @@global.time_zone;
|
||||||
|
Reference in New Issue
Block a user