diff options
| author | Elena Stepanova <elenst@montyprogram.com> | 2017-06-21 21:07:20 +0300 |
|---|---|---|
| committer | Elena Stepanova <elenst@montyprogram.com> | 2017-06-21 21:07:20 +0300 |
| commit | 0cf993c24f482663ba1685ecf97a23ab44f6912e (patch) | |
| tree | 1b18fddbbba6087c4c9c2ff94c0e58ec159bc68b /mysql-test/suite/large_tests | |
| parent | 0992be927e1c686c39c39fe53fc2a7869d55143d (diff) | |
| download | mariadb-git-0cf993c24f482663ba1685ecf97a23ab44f6912e.tar.gz | |
MDEV-11002 large_tests.rpl_slave_net_timeout fails due to connection logging
Diffstat (limited to 'mysql-test/suite/large_tests')
| -rw-r--r-- | mysql-test/suite/large_tests/r/rpl_slave_net_timeout.result | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/mysql-test/suite/large_tests/r/rpl_slave_net_timeout.result b/mysql-test/suite/large_tests/r/rpl_slave_net_timeout.result index 4dcc2e6295f..ad704c0c683 100644 --- a/mysql-test/suite/large_tests/r/rpl_slave_net_timeout.result +++ b/mysql-test/suite/large_tests/r/rpl_slave_net_timeout.result @@ -1,20 +1,27 @@ include/master-slave.inc [connection master] +connection master; set @save_general_log = @@global.general_log; set @save_log_output = @@global.log_output; +connection slave; set @save_slave_net_timeout = @@global.slave_net_timeout; +connection master; set @@global.general_log = ON; set @@global.log_output = 'table,file'; +connection slave; 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 +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 asc limit 1 into @ts_prev; 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.log_output = @save_log_output; +connection slave; set @@global.slave_net_timeout = @save_slave_net_timeout; include/rpl_end.inc |