Skip to content

Commit 6074b60

Browse files
Dyre Tjeldvollzmur
authored andcommitted
Bug#37272728: main.time_zone relies on deprecated timezone name MET
Backport to 5.7.49. Problem: Test used deprecated time zone name MET, and prints it in result file. When OS changes the time zone name used when specifying TZ=MET there is a result diff. Solution: Switch from deprected MET to CET as the name for the time zone. Change-Id: I6c69c3ad62153a79c9337da4ecb4f5a13a248d56
1 parent f4e724f commit 6074b60

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

mysql-test/r/timezone.result

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
DROP TABLE IF EXISTS t1;
22
show variables like "system_time_zone";
33
Variable_name Value
4-
system_time_zone MET
4+
system_time_zone CET
55
select @a:=FROM_UNIXTIME(1);
66
@a:=FROM_UNIXTIME(1)
77
1970-01-01 01:00:01

mysql-test/t/timezone-master.opt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
--timezone=MET
1+
--timezone=CET

mysql-test/t/timezone.test

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
#
33
# Test of SYSTEM time zone handling ( for my_system_gmt_sec()).
4-
# This script must be run with TZ=MET
4+
# This script must be run with TZ=CET
55

66
-- require r/have_met_timezone.require
77
disable_query_log;
@@ -14,7 +14,7 @@ DROP TABLE IF EXISTS t1;
1414
--enable_warnings
1515

1616
# The following is because of daylight saving time
17-
--replace_result MEST MET
17+
--replace_result MEST CET
1818
show variables like "system_time_zone";
1919

2020
#

0 commit comments

Comments
 (0)