Control: tags -1 patch

I don't think this is related to the time of build; I don't expect it to start failing again unless the MET timezone alias starts being installed again (i.e. something adds a tzdata-legacy dependency or the aliases get moved back to tzdata).

However, it appears to be easy to actually fix, so I suggest we do so. Warning: this patch has not been tested.

Description: Stop using MET timezone name

From tzdata 2024b-1, MET is an alias for Europe/Brussels (printed as
CET, failing this test); from 2024b-3, it is moved to tzdata-legacy.

Author: Rebecca N. Palmer <rebecca_pal...@zoho.com>
Bug-Debian: https://bugs.debian.org/1084293

--- mariadb-11.4.3.orig/mysql-test/main/timezone-master.opt
+++ mariadb-11.4.3/mysql-test/main/timezone-master.opt
@@ -1 +1 @@
---timezone=MET
+--timezone=Europe/Brussels
--- mariadb-11.4.3.orig/mysql-test/main/timezone.result
+++ mariadb-11.4.3/mysql-test/main/timezone.result
@@ -1,6 +1,6 @@
 show variables like "system_time_zone";
 Variable_name  Value
-system_time_zone       MET
+system_time_zone       CET
 #
 # Test unix timestamp
 #
@@ -82,7 +82,7 @@ alter table mysql.time_zone_transition_t
 SET @@time_zone= default;
 SELECT DATE_FORMAT('2009-11-01 22:23:00', '%z %Z') AS current_timezone;
 current_timezone
-+0100 MET
++0100 CET
 SELECT DATE_FORMAT('2008-06-04 02:23:00', '%z %Z') AS current_timezone;
 current_timezone
-+0200 MEST
++0200 CEST
--- mariadb-11.4.3.orig/mysql-test/main/timezone.test
+++ mariadb-11.4.3/mysql-test/main/timezone.test
@@ -1,6 +1,6 @@
 #
 # Test of SYSTEM time zone handling ( for my_system_gmt_sec()).
-# This script must be run with TZ=MET
+# This script must be run with a CET timezone e.g. TZ=Europe/Brussels

 -- require include/have_met_timezone.require
 disable_query_log;
@@ -8,7 +8,7 @@ select FROM_UNIXTIME(24*3600);
 enable_query_log;

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

 --echo #
Description: Stop using MET timezone name

From tzdata 2024b-1, MET is an alias for Europe/Brussels (printed as
CET, failing this test); from 2024b-3, it is moved to tzdata-legacy.

Author: Rebecca N. Palmer <rebecca_pal...@zoho.com>
Bug-Debian: https://bugs.debian.org/1084293

--- mariadb-11.4.3.orig/mysql-test/main/timezone-master.opt
+++ mariadb-11.4.3/mysql-test/main/timezone-master.opt
@@ -1 +1 @@
---timezone=MET
+--timezone=Europe/Brussels
--- mariadb-11.4.3.orig/mysql-test/main/timezone.result
+++ mariadb-11.4.3/mysql-test/main/timezone.result
@@ -1,6 +1,6 @@
 show variables like "system_time_zone";
 Variable_name	Value
-system_time_zone	MET
+system_time_zone	CET
 #
 # Test unix timestamp
 #
@@ -82,7 +82,7 @@ alter table mysql.time_zone_transition_t
 SET @@time_zone= default;
 SELECT DATE_FORMAT('2009-11-01 22:23:00', '%z %Z') AS current_timezone;
 current_timezone
-+0100 MET
++0100 CET
 SELECT DATE_FORMAT('2008-06-04 02:23:00', '%z %Z') AS current_timezone;
 current_timezone
-+0200 MEST
++0200 CEST
--- mariadb-11.4.3.orig/mysql-test/main/timezone.test
+++ mariadb-11.4.3/mysql-test/main/timezone.test
@@ -1,6 +1,6 @@
 #
 # Test of SYSTEM time zone handling ( for my_system_gmt_sec()).
-# This script must be run with TZ=MET
+# This script must be run with a CET timezone e.g. TZ=Europe/Brussels
 
 -- require include/have_met_timezone.require
 disable_query_log;
@@ -8,7 +8,7 @@ select FROM_UNIXTIME(24*3600);
 enable_query_log;
 
 # The following is because of daylight saving time
---replace_result MEST MET
+--replace_result CEST CET
 show variables like "system_time_zone";
 
 --echo #

Reply via email to