Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions mysql-test/main/change_master_default.result
Original file line number Diff line number Diff line change
Expand Up @@ -201,10 +201,6 @@ slave_heartbeat_period 15.000
RESET REPLICA 'unset' ALL;
CHANGE MASTER 'unset' TO master_host='127.0.1.3';
# Validate command line options
# restart_abort: --master-heartbeat-period=''
# restart_abort: --master-heartbeat-period=123abc
# restart_abort: --master-heartbeat-period=-1
# restart_abort: --master-heartbeat-period=4294967.296
# restart: --skip-slave-start --master-heartbeat-period=0.000499
SELECT connection_name, slave_heartbeat_period
FROM information_schema.slave_status ORDER BY connection_name;
Expand Down
25 changes: 11 additions & 14 deletions mysql-test/main/change_master_default.test
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@

# only need CHANGE MASTER and IS.slave_status
--source include/have_binlog_format_mixed.inc
# --exec $MYSQLD bypasses MTR's --user=root injection
--source include/not_as_root.inc

CREATE PROCEDURE show_defaultable_fields()
SELECT connection_name,
Expand Down Expand Up @@ -104,21 +106,16 @@ CHANGE MASTER 'unset' TO master_host='127.0.1.3';
--echo # Validate command line options

# Invalid `--master-heartbeat-period` values should abort the server
# (`restart_abort` includes a wait for the server to exit on its own,
# e.g., due to a startup error.)
--source include/shutdown_mysqld.inc
--let $restart_parameters= restart_abort: --master-heartbeat-period=''
--echo # $restart_parameters
--write_line "$restart_parameters" $_expect_file_name
--let $restart_parameters= restart_abort: --master-heartbeat-period=123abc
--echo # $restart_parameters
--write_line "$restart_parameters" $_expect_file_name
--let $restart_parameters= restart_abort: --master-heartbeat-period=-1
--echo # $restart_parameters
--write_line "$restart_parameters" $_expect_file_name
--let $restart_parameters= restart_abort: --master-heartbeat-period=4294967.296
--echo # $restart_parameters
--write_line "$restart_parameters" $_expect_file_name

--disable_result_log
--error 1
--exec $MYSQLD --defaults-group-suffix=.1 --defaults-file=$MYSQLTEST_VARDIR/my.cnf --master-heartbeat-period=123abc
--error 1
--exec $MYSQLD --defaults-group-suffix=.1 --defaults-file=$MYSQLTEST_VARDIR/my.cnf --master-heartbeat-period=-1
--error 1
--exec $MYSQLD --defaults-group-suffix=.1 --defaults-file=$MYSQLTEST_VARDIR/my.cnf --master-heartbeat-period=4294967.296
--enable_result_log

# Numbers between 0 and 0.5 exclusive should warn about rounding to 0 (disabled)
--let $restart_parameters= --skip-slave-start --master-heartbeat-period=0.000499
Expand Down
Loading