1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00

MDEV-31684 post-review changes

This commit is contained in:
Sergei Golubchik
2023-09-15 20:24:59 +02:00
committed by Rucha Deodhar
parent 94eb819296
commit 6f55cb4b7c
7 changed files with 105 additions and 134 deletions

View File

@ -258,9 +258,11 @@ select time_format('01 02:02:02', '%T');
select time_format('2001-01-01 02:02:02', '%T');
--echo #
--echo # Beginning of 11.3 test
--echo # End of 10.2 test
--echo #
--echo # MDEV-31684: Add timezone information to DATE_FORMAT
--echo #
--echo # MDEV-31684 Add timezone information to DATE_FORMAT
--echo #
SET @old_timezone= @@time_zone;
@ -290,17 +292,8 @@ SELECT DATE_FORMAT('2009-10-04 22:23:00', '%z %Z') AS current_timezone;
SET TIME_ZONE='UTC';
SELECT DATE_FORMAT('2009-10-04 22:23:00', '%z %Z') AS current_timezone;
--echo # using system time
--echo #
--echo # output depends on system time information. Hence replacing
--echo # to avoid result diff test failures.
--echo #
SET @@time_zone= default;
--replace_regex /[+-][0-9]* [A-Z]*/+|-HH:MM ABC/
SELECT DATE_FORMAT('2009-10-04 22:23:00', '%z %Z') AS current_timezone;
SET @@time_zone= @old_timezone;
--echo #
--echo # End of 11.3 test
--echo #