mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
MDEV-11002 large_tests.rpl_slave_net_timeout fails due to connection logging
This commit is contained in:
@@ -1,20 +1,27 @@
|
|||||||
include/master-slave.inc
|
include/master-slave.inc
|
||||||
[connection master]
|
[connection master]
|
||||||
|
connection master;
|
||||||
set @save_general_log = @@global.general_log;
|
set @save_general_log = @@global.general_log;
|
||||||
set @save_log_output = @@global.log_output;
|
set @save_log_output = @@global.log_output;
|
||||||
|
connection slave;
|
||||||
set @save_slave_net_timeout = @@global.slave_net_timeout;
|
set @save_slave_net_timeout = @@global.slave_net_timeout;
|
||||||
|
connection master;
|
||||||
set @@global.general_log = ON;
|
set @@global.general_log = ON;
|
||||||
set @@global.log_output = 'table,file';
|
set @@global.log_output = 'table,file';
|
||||||
|
connection slave;
|
||||||
include/stop_slave.inc
|
include/stop_slave.inc
|
||||||
change master to master_host = '127.0.0.1',master_port = MASTER_PORT,
|
change master to master_host = '127.0.0.1',master_port = MASTER_PORT,
|
||||||
master_user = 'root', master_heartbeat_period = 0;
|
master_user = 'root', master_heartbeat_period = 0;
|
||||||
set @@global.slave_net_timeout = @@global.net_read_timeout * 2;
|
set @@global.slave_net_timeout = @@global.net_read_timeout * 2;
|
||||||
include/start_slave.inc
|
include/start_slave.inc
|
||||||
include/stop_slave.inc
|
include/stop_slave.inc
|
||||||
|
connection master;
|
||||||
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 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;
|
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]
|
include/assert.inc [time between last reconnection and the reconnection before that should be >= slave_net_timeout]
|
||||||
|
connection master;
|
||||||
set @@global.general_log = @save_general_log;
|
set @@global.general_log = @save_general_log;
|
||||||
set @@global.log_output = @save_log_output;
|
set @@global.log_output = @save_log_output;
|
||||||
|
connection slave;
|
||||||
set @@global.slave_net_timeout = @save_slave_net_timeout;
|
set @@global.slave_net_timeout = @save_slave_net_timeout;
|
||||||
include/rpl_end.inc
|
include/rpl_end.inc
|
||||||
|
Reference in New Issue
Block a user