mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 20:42:30 +01:00
6e69536956
Problem 1: tests often fail in pushbuild with a timeout when waiting for the slave to start/stop/receive error. Fix 1: Updated the wait_for_slave_* macros in the following way: - The timeout is increased by a factor ten - Refactored the macros so that wait_for_slave_param does the work for the other macros. Problem 2: Tests are often incorrectly written, lacking a source include/wait_for_slave_to_[start|stop].inc. Fix 2: Improved the chance to get it right by adding include/start_slave.inc and include/stop_slave.inc, and updated tests to use these. Problem 3: The the built-in test language command wait_for_slave_to_stop is a misnomer (does not wait for the slave io thread) and does not give as much debug info in case of failure as the otherwise equivalent macro source include/wait_for_slave_sql_to_stop.inc Fix 3: Replaced all calls to the built-in command by a call to the macro. Problem 4: Some, but not all, of the wait_for_slave_* macros had an implicit connection slave. This made some tests confusing to read, and made it more difficult to use the macro in circular replication scenarios, where the connection named master needs to wait. Fix 4: Removed the implicit connection slave from all wait_for_slave_* macros, and updated tests to use an explicit connection slave where necessary. Problem 5: The macros wait_slave_status.inc and wait_show_pattern.inc were unused. Moreover, using them is difficult and error-prone. Fix 5: remove these macros. Problem 6: log_bin_trust_function_creators_basic failed when running tests because it assumed @@global.log_bin_trust_function_creators=1, and some tests modified this variable without resetting it to its original value. Fix 6: All tests that use this variable have been updated so that they reset the value at end of test. mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test: Replaced wait_for_slave_to_stop by include/wait_for_slave_sql_to_stop.inc mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test: Replaced wait_for_slave_to_stop by include/wait_for_slave_sql_to_stop.inc Added connection slave since includ/wait_for_slave_sql_to_stop.inc does not do that anymore. mysql-test/extra/rpl_tests/rpl_log.test: Replaced start slave+wait_slave_status by start_slave.inc mysql-test/include/reset_master_and_slave.inc: replaced start/stop slave by start_slave.inc/stop_slave.inc mysql-test/include/sync_slave_io_with_master.inc: Improved comments and error message. mysql-test/include/wait_for_slave_io_to_stop.inc: Refactored to use wait_for_slave_param.inc. Removed connection slave. mysql-test/include/wait_for_slave_param.inc: - Improved usage instructions - Added more debug info in case of timeout - Added parameters $slave_param_comparison, $slave_timeout, $slave_keep_connection, $slave_error_message mysql-test/include/wait_for_slave_sql_error.inc: Refactored to use wait_for_slave_param.inc. Removed connection slave. mysql-test/include/wait_for_slave_sql_to_start.inc: Refactored to use wait_for_slave_param.inc. Removed connection slave. mysql-test/include/wait_for_slave_sql_to_stop.inc: Refactored to use wait_for_slave_param.inc. Removed connection slave. mysql-test/include/wait_for_slave_to_start.inc: Refactored to use wait_for_slave_param.inc. Removed connection slave. mysql-test/include/wait_for_slave_to_stop.inc: Refactored to use wait_for_slave_param.inc. Removed connection slave. mysql-test/include/wait_show_pattern.inc: Removed unused (and error-prone) file mysql-test/include/wait_slave_status.inc: Removed unused (and error-prone) file mysql-test/suite/binlog/t/binlog_auto_increment_bug33029.test: Renamed $keep_connection to $slave_keep_connection. mysql-test/suite/rpl/t/rpl_bug26395.test: Replace stop slave by stop_slave.inc mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.test: Replace start/stop slave by start_slave.inc/stop_slave.inc. Replace wait_for_slave_param by wait_for_slave_sql_to_stop.inc. mysql-test/suite/rpl/t/rpl_dual_pos_advance.test: Renamed $keep_connection to $slave_keep_connection. mysql-test/suite/rpl/t/rpl_flushlog_loop.test: Replace wait_slave_status by start_slave.inc mysql-test/suite/rpl/t/rpl_idempotency.test: Added connection slave since wait_for_slave_sql_to_stop.inc does not do that any more. mysql-test/suite/rpl/t/rpl_incident.test: Replaced wait_for_slave_to_stop by wait_for_slave_sql_to_stop.inc mysql-test/suite/rpl/t/rpl_init_slave.test: Replaced start/stop slave by start_slave.inc/stop_slave.inc. Replaced save_master_pos;connection slave;sync_with_master by sync_slave_with_master. mysql-test/suite/rpl/t/rpl_log_pos.test: Replaced start/stop slave by start_slave.inc/stop_slave.inc. Replaced wait_for_slave_param by other wait_for_slave_* macros. mysql-test/suite/rpl/t/rpl_packet.test: Replaced start/stop slave by start_slave.inc/stop_slave.inc. mysql-test/suite/rpl/t/rpl_row_inexist_tbl.test: Replaced start/stop slave by start_slave.inc/stop_slave.inc. mysql-test/suite/rpl/t/rpl_row_stop_middle_update.test: Replaced start/stop slave by start_slave.inc/stop_slave.inc. mysql-test/suite/rpl/t/rpl_row_until.test: Replaced start/stop slave by start_slave.inc/stop_slave.inc. Replaced save_master_pos;connection slave;sync_with_master by sync_slave_with_master. mysql-test/suite/rpl/t/rpl_server_id1.test: Replaced start/stop slave by start_slave.inc/stop_slave.inc. mysql-test/suite/rpl/t/rpl_slave_grp_exec.test: Replaced start/stop slave by start_slave.inc/stop_slave.inc. mysql-test/suite/rpl/t/rpl_slave_skip.test: Replaced start/stop slave by start_slave.inc/stop_slave.inc. mysql-test/suite/rpl/t/rpl_slave_status.test: Replaced start/stop slave by start_slave.inc/stop_slave.inc. mysql-test/suite/rpl/t/rpl_sp.test: Restore @@global.log_bin_trust_function_creators at end of test. mysql-test/suite/rpl/t/rpl_sp_effects.test: Restore @@global.log_bin_trust_function_creators at end of test. mysql-test/suite/rpl/t/rpl_stm_until.test: Replaced start/stop slave by start_slave.inc/stop_slave.inc. Replaced save_master_pos;connection slave;sync_with_master by sync_slave_with_master. mysql-test/suite/rpl_ndb/t/rpl_ndb_basic.test: Replaced start slave by start_slave.inc. Added explicit connection slave since wait_for_slave_sql_to_stop.inc does not do that anymore. mysql-test/t/disabled.def: Disabled failing test. mysql-test/t/func_time.test: Restore @@global.log_bin_trust_function_creators at end of test. mysql-test/t/grant.test: Restore @@global.log_bin_trust_function_creators at end of test. mysql-test/t/grant2.test: Restore @@global.log_bin_trust_function_creators at end of test. mysql-test/t/innodb_notembedded.test: Restore @@global.log_bin_trust_function_creators at end of test. mysql-test/t/log_bin_trust_function_creators_func.test: Restore @@global.log_bin_trust_function_creators at end of test. Clean up at end of test by dropping the created user. mysql-test/t/query_cache.test: Restore @@global.log_bin_trust_function_creators at end of test. mysql-test/t/query_cache_notembedded.test: Restore @@global.log_bin_trust_function_creators at end of test. mysql-test/t/rpl_init_slave_func.test: Replaced start/stop slave by start_slave.inc/stop_slave.inc. mysql-test/t/timezone2.test: Restore @@global.log_bin_trust_function_creators at end of test.
277 lines
8.8 KiB
Text
277 lines
8.8 KiB
Text
# This script tests our own time zone support functions
|
|
|
|
# Preparing playground
|
|
--disable_warnings
|
|
drop table if exists t1, t2;
|
|
drop function if exists f1;
|
|
--enable_warnings
|
|
|
|
|
|
#
|
|
# Let us first check +HH:MM style timezones
|
|
#
|
|
create table t1 (ts timestamp);
|
|
|
|
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');
|
|
|
|
set time_zone='+10:30';
|
|
select unix_timestamp(utc_timestamp())-unix_timestamp(current_timestamp());
|
|
insert into t1 (ts) values ('2003-03-30 02:30:00');
|
|
|
|
set time_zone='-10:00';
|
|
select unix_timestamp(utc_timestamp())-unix_timestamp(current_timestamp());
|
|
insert into t1 (ts) values ('2003-03-30 02:30:00');
|
|
|
|
# Here we will get different results
|
|
select * from t1;
|
|
|
|
drop table t1;
|
|
|
|
|
|
#
|
|
# Let us try DB specified time zones
|
|
#
|
|
select Name from mysql.time_zone_name where Name in
|
|
('UTC','Universal','MET','Europe/Moscow','leap/Europe/Moscow');
|
|
|
|
create table t1 (i int, ts timestamp);
|
|
|
|
set time_zone='MET';
|
|
|
|
# We check common date time value and non existent or ambiguios values
|
|
# Normal value without DST
|
|
insert into t1 (i, ts) values
|
|
(unix_timestamp('2003-03-01 00:00:00'),'2003-03-01 00:00:00');
|
|
# Values around and in spring time-gap
|
|
insert into t1 (i, ts) values
|
|
(unix_timestamp('2003-03-30 01:59:59'),'2003-03-30 01:59:59'),
|
|
(unix_timestamp('2003-03-30 02:30:00'),'2003-03-30 02:30:00'),
|
|
(unix_timestamp('2003-03-30 03:00:00'),'2003-03-30 03:00:00');
|
|
# Values around and in spring time-gap
|
|
insert into t1 (i, ts) values
|
|
(unix_timestamp(20030330015959),20030330015959),
|
|
(unix_timestamp(20030330023000),20030330023000),
|
|
(unix_timestamp(20030330030000),20030330030000);
|
|
# Normal value with DST
|
|
insert into t1 (i, ts) values
|
|
(unix_timestamp('2003-05-01 00:00:00'),'2003-05-01 00:00:00');
|
|
# Ambiguos values (also check for determenism)
|
|
insert into t1 (i, ts) values
|
|
(unix_timestamp('2003-10-26 01:00:00'),'2003-10-26 01:00:00'),
|
|
(unix_timestamp('2003-10-26 02:00:00'),'2003-10-26 02:00:00'),
|
|
(unix_timestamp('2003-10-26 02:59:59'),'2003-10-26 02:59:59'),
|
|
(unix_timestamp('2003-10-26 04:00:00'),'2003-10-26 04:00:00'),
|
|
(unix_timestamp('2003-10-26 02:59:59'),'2003-10-26 02:59:59');
|
|
|
|
set time_zone='UTC';
|
|
|
|
select * from t1;
|
|
|
|
truncate table t1;
|
|
|
|
# Simple check for 'Europe/Moscow' time zone just for showing that it works
|
|
set time_zone='Europe/Moscow';
|
|
insert into t1 (i, ts) values
|
|
(unix_timestamp('2004-01-01 00:00:00'),'2004-01-01 00:00:00'),
|
|
(unix_timestamp('2004-03-28 02:30:00'),'2004-03-28 02:30:00'),
|
|
(unix_timestamp('2004-08-01 00:00:00'),'2003-08-01 00:00:00'),
|
|
(unix_timestamp('2004-10-31 02:30:00'),'2004-10-31 02:30:00');
|
|
select * from t1;
|
|
truncate table t1;
|
|
|
|
|
|
#
|
|
# Check for time zone with leap seconds
|
|
# Values in ts column must be the same but values in i column should
|
|
# differ from corresponding values for Europe/Moscow a bit.
|
|
#
|
|
set time_zone='leap/Europe/Moscow';
|
|
insert into t1 (i, ts) values
|
|
(unix_timestamp('2004-01-01 00:00:00'),'2004-01-01 00:00:00'),
|
|
(unix_timestamp('2004-03-28 02:30:00'),'2004-03-28 02:30:00'),
|
|
(unix_timestamp('2004-08-01 00:00:00'),'2003-08-01 00:00:00'),
|
|
(unix_timestamp('2004-10-31 02:30:00'),'2004-10-31 02:30:00');
|
|
select * from t1;
|
|
truncate table t1;
|
|
# Let us test leap jump
|
|
insert into t1 (i, ts) values
|
|
(unix_timestamp('1981-07-01 03:59:59'),'1981-07-01 03:59:59'),
|
|
(unix_timestamp('1981-07-01 04:00:00'),'1981-07-01 04:00:00');
|
|
select * from t1;
|
|
# Additional 60ieth second!
|
|
select from_unixtime(362793609);
|
|
|
|
drop table t1;
|
|
|
|
|
|
#
|
|
# Let us test range for TIMESTAMP
|
|
#
|
|
create table t1 (ts timestamp);
|
|
set time_zone='UTC';
|
|
insert into t1 values ('0000-00-00 00:00:00'),('1969-12-31 23:59:59'),
|
|
('1970-01-01 00:00:00'),('1970-01-01 00:00:01'),
|
|
('2038-01-19 03:14:07'),('2038-01-19 03:14:08');
|
|
select * from t1;
|
|
truncate table t1;
|
|
# MET time zone has range shifted by one hour
|
|
set time_zone='MET';
|
|
insert into t1 values ('0000-00-00 00:00:00'),('1970-01-01 00:30:00'),
|
|
('1970-01-01 01:00:00'),('1970-01-01 01:00:01'),
|
|
('2038-01-19 04:14:07'),('2038-01-19 04:14:08');
|
|
select * from t1;
|
|
truncate table t1;
|
|
# same for +01:30 time zone
|
|
set time_zone='+01:30';
|
|
insert into t1 values ('0000-00-00 00:00:00'),('1970-01-01 01:00:00'),
|
|
('1970-01-01 01:30:00'),('1970-01-01 01:30:01'),
|
|
('2038-01-19 04:44:07'),('2038-01-19 04:44:08');
|
|
select * from t1;
|
|
|
|
drop table t1;
|
|
|
|
|
|
#
|
|
# Test of show variables
|
|
#
|
|
show variables like 'time_zone';
|
|
set time_zone = default;
|
|
show variables like 'time_zone';
|
|
|
|
|
|
#
|
|
# Let us try some invalid time zone specifications
|
|
#
|
|
--error 1298
|
|
set time_zone= '0';
|
|
--error 1298
|
|
set time_zone= '0:0';
|
|
--error 1298
|
|
set time_zone= '-20:00';
|
|
--error 1298
|
|
set time_zone= '+20:00';
|
|
--error 1298
|
|
set time_zone= 'Some/Unknown/Time/Zone';
|
|
|
|
|
|
# Let us check that aliases for time zones work and they are
|
|
# case-insensitive
|
|
select convert_tz(now(),'UTC', 'Universal') = now();
|
|
select convert_tz(now(),'utc', 'UTC') = now();
|
|
|
|
|
|
#
|
|
# Let us test CONVERT_TZ function (may be func_time.test is better place).
|
|
#
|
|
select convert_tz('1917-11-07 12:00:00', 'MET', 'UTC');
|
|
select convert_tz('1970-01-01 01:00:00', 'MET', 'UTC');
|
|
select convert_tz('1970-01-01 01:00:01', 'MET', 'UTC');
|
|
select convert_tz('2003-03-01 00:00:00', 'MET', 'UTC');
|
|
select convert_tz('2003-03-30 01:59:59', 'MET', 'UTC');
|
|
select convert_tz('2003-03-30 02:30:00', 'MET', 'UTC');
|
|
select convert_tz('2003-03-30 03:00:00', 'MET', 'UTC');
|
|
select convert_tz('2003-05-01 00:00:00', 'MET', 'UTC');
|
|
select convert_tz('2003-10-26 01:00:00', 'MET', 'UTC');
|
|
select convert_tz('2003-10-26 02:00:00', 'MET', 'UTC');
|
|
select convert_tz('2003-10-26 02:59:59', 'MET', 'UTC');
|
|
select convert_tz('2003-10-26 04:00:00', 'MET', 'UTC');
|
|
select convert_tz('2038-01-19 04:14:07', 'MET', 'UTC');
|
|
select convert_tz('2038-01-19 04:14:08', 'MET', 'UTC');
|
|
select convert_tz('2103-01-01 04:00:00', 'MET', 'UTC');
|
|
|
|
# Let us test variable time zone argument
|
|
create table t1 (tz varchar(3));
|
|
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;
|
|
|
|
# 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');
|
|
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');
|
|
|
|
#
|
|
# Test for bug #4508 "CONVERT_TZ() function with new time zone as param
|
|
# crashes server." (Was caused by improperly worked mechanism of time zone
|
|
# dynamical loading).
|
|
#
|
|
create table t1 (ts timestamp);
|
|
set timestamp=1000000000;
|
|
insert into t1 (ts) values (now());
|
|
select convert_tz(ts, @@time_zone, 'Japan') from t1;
|
|
drop table t1;
|
|
|
|
#
|
|
# Test for bug #7705 "CONVERT_TZ() crashes with subquery/WHERE on index
|
|
# column". Queries in which one of time zone arguments of CONVERT_TZ() is
|
|
# determined as constant only at val() stage (not at fix_fields() stage),
|
|
# should not crash server.
|
|
#
|
|
select convert_tz('2005-01-14 17:00:00', 'UTC', custTimeZone) from (select 'UTC' as custTimeZone) as tmp;
|
|
|
|
#
|
|
# Test for bug #7899 "CREATE TABLE .. SELECT .. and CONVERT_TZ() function
|
|
# does not work well together". The following statement should return only
|
|
# one NULL row and not result of full join.
|
|
#
|
|
create table t1 select convert_tz(NULL, NULL, NULL);
|
|
select * from t1;
|
|
drop table t1;
|
|
|
|
# End of 4.1 tests
|
|
|
|
#
|
|
# Test for bug #11081 "Using a CONVERT_TZ function in a stored function
|
|
# or trigger fails".
|
|
#
|
|
SET @old_log_bin_trust_function_creators = @@global.log_bin_trust_function_creators;
|
|
SET GLOBAL log_bin_trust_function_creators = 1;
|
|
|
|
create table t1 (ldt datetime, udt datetime);
|
|
create function f1(i datetime) returns datetime
|
|
return convert_tz(i, 'UTC', 'Europe/Moscow');
|
|
create trigger t1_bi before insert on t1 for each row
|
|
set new.udt:= convert_tz(new.ldt, 'Europe/Moscow', 'UTC');
|
|
# This should work without errors
|
|
insert into t1 (ldt) values ('2006-04-19 16:30:00');
|
|
select * from t1;
|
|
# This should work without errors as well
|
|
select ldt, f1(udt) as ldt2 from t1;
|
|
drop table t1;
|
|
drop function f1;
|
|
|
|
SET @@global.log_bin_trust_function_creators= @old_log_bin_trust_function_creators;
|
|
|
|
# End of 5.0 tests
|
|
|
|
|
|
#
|
|
# BUG#9953: CONVERT_TZ requires mysql.time_zone_name to be locked
|
|
# BUG#19339: CONVERT_TZ(): overly aggressive in locking time_zone_name
|
|
# table
|
|
#
|
|
--disable_warnings
|
|
DROP TABLE IF EXISTS t1;
|
|
--enable_warnings
|
|
|
|
CREATE TABLE t1 (t TIMESTAMP);
|
|
INSERT INTO t1 VALUES (NULL), (NULL);
|
|
|
|
LOCK TABLES t1 WRITE;
|
|
|
|
# The following two queries should not return error that time zone
|
|
# tables aren't locked. We use IS NULL below to supress timestamp
|
|
# result.
|
|
SELECT CONVERT_TZ(NOW(), 'UTC', 'Europe/Moscow') IS NULL;
|
|
UPDATE t1 SET t = CONVERT_TZ(t, 'UTC', 'Europe/Moscow');
|
|
|
|
UNLOCK TABLES;
|
|
|
|
DROP TABLE t1;
|
|
|
|
|
|
--echo End of 5.1 tests
|