mirror of
https://github.com/MariaDB/server.git
synced 2025-05-07 04:01:59 +03:00
72fe4deccb
Problem: the test had not been updated after BUG#49978 was pushed
Fix: add 'set $rpl_only_running_threads= 1' to the end of the test
and update the result file.
Also, use include/assert.inc for an assertion (instead of relying
on result file comparison).
Also, move 'set @@global.slave_net_timeout' forwards, to get rid
of a warning.
mysql-test/suite/large_tests/r/rpl_slave_net_timeout.result:
updated result file
mysql-test/suite/large_tests/t/rpl_slave_net_timeout.test:
- Got rid of warning "The requested value for the heartbeat period
exceeds the value of `slave_net_timeout' seconds. A sensible
value for the period should be less than the timeout." by
changing order of "set slave_net_timeout" and
"change master to master_heartbeat_period".
- replaced result file comparison by include/assert.inc
- added "let $rpl_only_running_threads= 1"
21 lines
1.2 KiB
Plaintext
21 lines
1.2 KiB
Plaintext
include/master-slave.inc
|
|
[connection master]
|
|
set @save_general_log = @@global.general_log;
|
|
set @save_log_output = @@global.log_output;
|
|
set @save_slave_net_timeout = @@global.slave_net_timeout;
|
|
set @@global.general_log = ON;
|
|
set @@global.log_output = 'table,file';
|
|
include/stop_slave.inc
|
|
change master to master_host = '127.0.0.1',master_port = MASTER_PORT,
|
|
master_user = 'root', master_heartbeat_period = 0;
|
|
set @@global.slave_net_timeout = @@global.net_read_timeout * 2;
|
|
include/start_slave.inc
|
|
include/stop_slave.inc
|
|
select event_time from (select event_time from mysql.general_log as t_1 where command_type like 'Connect' order by event_time desc limit 2) as t_2 order by event_time desc limit 1 into @ts_last;
|
|
select event_time from (select event_time from mysql.general_log as t_1 where command_type like 'Connect' order by event_time desc limit 2) as t_2 order by event_time asc limit 1 into @ts_prev;
|
|
include/assert.inc [time between last reconnection and the reconnection before that should be >= slave_net_timeout]
|
|
set @@global.general_log = @save_general_log;
|
|
set @@global.log_output = @save_log_output;
|
|
set @@global.slave_net_timeout = @save_slave_net_timeout;
|
|
include/rpl_end.inc
|