1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00

Merge branch 'bb-10.3-all-builders' into bb-10.4-all-builders

This commit is contained in:
Lena Startseva
2022-09-23 19:47:13 +07:00
274 changed files with 1896 additions and 175 deletions

View File

@ -12,6 +12,9 @@ drop function if exists f1;
#
create table t1 (ts timestamp);
#enable after fix MDEV-27871
--disable_view_protocol
set time_zone='+00:00';
select unix_timestamp(utc_timestamp())-unix_timestamp(current_timestamp());
insert into t1 (ts) values ('2003-03-30 02:30:00');
@ -27,6 +30,8 @@ insert into t1 (ts) values ('2003-03-30 02:30:00');
# Here we will get different results
select * from t1;
--enable_view_protocol
drop table t1;
@ -187,6 +192,9 @@ insert into t1 (tz) values ('MET'), ('UTC');
select tz, convert_tz('2003-12-31 00:00:00',tz,'UTC'), convert_tz('2003-12-31 00:00:00','UTC',tz) from t1 order by tz;
drop table t1;
#enable after fix MDEV-27871
--disable_view_protocol
# Parameters to CONVERT_TZ() what should give NULL
select convert_tz('2003-12-31 04:00:00', NULL, 'UTC');
select convert_tz('2003-12-31 04:00:00', 'SomeNotExistingTimeZone', 'UTC');
@ -194,6 +202,8 @@ select convert_tz('2003-12-31 04:00:00', 'MET', 'SomeNotExistingTimeZone');
select convert_tz('2003-12-31 04:00:00', 'MET', NULL);
select convert_tz( NULL, 'MET', 'UTC');
--enable_view_protocol
#
# Test for bug #4508 "CONVERT_TZ() function with new time zone as param
# crashes server." (Was caused by improperly worked mechanism of time zone
@ -254,6 +264,7 @@ SET @@global.log_bin_trust_function_creators= @old_log_bin_trust_function_creato
# BUG#19339: CONVERT_TZ(): overly aggressive in locking time_zone_name
# table
#
--disable_service_connection
--disable_warnings
DROP TABLE IF EXISTS t1;
--enable_warnings
@ -272,6 +283,7 @@ UPDATE t1 SET t = CONVERT_TZ(t, 'UTC', 'Europe/Moscow');
UNLOCK TABLES;
DROP TABLE t1;
--enable_service_connection
--echo #
--echo # Bug #55424: convert_tz crashes when fed invalid data
@ -302,8 +314,13 @@ SET timestamp=DEFAULT;
--echo #
--echo # MDEV-5506 safe_mutex: Trying to lock unitialized mutex at safemalloc.c on server shutdown after SELECT with CONVERT_TZ
--echo #
#enable after fix MDEV-27871
--disable_view_protocol
SELECT CONVERT_TZ('2001-10-08 00:00:00', MAKE_SET(0,'+01:00'), '+00:00' );
--enable_view_protocol
--echo #
--echo # End of 5.3 tests