diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog b/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog index c85f33b95..81985d120 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog +++ b/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog @@ -7,9 +7,9 @@ type=service router=binlogrouter user=skysql passwd=skysql -version_string=5.6.15-log +#version_string=5.6.15-log #router_options=server-id=3,user=repl,password=repl,master-id=1 -router_options=server-id=3,user=repl,password=repl,longburst=500,heartbeat=30,binlogdir=/var/lib/maxscale/Binlog_Service,mariadb10-compatibility=1 +router_options=server-id=9993,send_slave_heartbeat=On,user=repl,password=repl,longburst=500,heartbeat=10,binlogdir=/var/lib/maxscale/Binlog_Service,mariadb10-compatibility=1 [Binlog Listener] diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog.in b/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog.in index c85f33b95..81985d120 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog.in +++ b/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog.in @@ -7,9 +7,9 @@ type=service router=binlogrouter user=skysql passwd=skysql -version_string=5.6.15-log +#version_string=5.6.15-log #router_options=server-id=3,user=repl,password=repl,master-id=1 -router_options=server-id=3,user=repl,password=repl,longburst=500,heartbeat=30,binlogdir=/var/lib/maxscale/Binlog_Service,mariadb10-compatibility=1 +router_options=server-id=9993,send_slave_heartbeat=On,user=repl,password=repl,longburst=500,heartbeat=10,binlogdir=/var/lib/maxscale/Binlog_Service,mariadb10-compatibility=1 [Binlog Listener] diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog1 b/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog1 index 473832a71..ee369a8f3 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog1 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog1 @@ -7,9 +7,9 @@ type=service router=binlogrouter user=skysql passwd=skysql -version_string=5.6.15-log +#version_string=5.6.15-log #router_options=server-id=3,user=repl,password=repl,master-id=1 -router_options=server-id=3,longburst=500,heartbeat=30,binlogdir=/var/lib/maxscale/Binlog_Service,mariadb10-compatibility=1 +router_options=server-id=9993,send_slave_heartbeat=On,longburst=500,heartbeat=10,binlogdir=/var/lib/maxscale/Binlog_Service,mariadb10-compatibility=1 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog2 b/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog2 index 2d41e8396..0d03663a3 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog2 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog2 @@ -8,9 +8,9 @@ type=service router=binlogrouter user=skysql passwd=skysql -version_string=5.6.15-log +#version_string=5.6.15-log #router_options=server-id=3,user=repl,password=repl,master-id=1 -router_options=server-id=3,user=repl,password=repl,longburst=500,heartbeat=30,binlogdir=/var/lib/maxscale/Binlog_Service,transaction_safety=1,mariadb10-compatibility=1 +router_options=server-id=9993,send_slave_heartbeat=On,user=repl,password=repl,longburst=500,heartbeat=10,binlogdir=/var/lib/maxscale/Binlog_Service,transaction_safety=1,mariadb10-compatibility=1 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog_semisync b/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog_semisync index 4fb918415..76a8f6910 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog_semisync +++ b/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog_semisync @@ -8,9 +8,9 @@ router=binlogrouter #servers=master user=skysql passwd=skysql -version_string=5.6.15-log +#version_string=5.6.15-log #router_options=server-id=3,user=repl,password=repl,master-id=1 -router_options=server-id=3,user=repl,password=repl,longburst=500,heartbeat=30,binlogdir=/var/lib/maxscale/Binlog_Service,semisync=1,transaction_safety=1,mariadb10-compatibility=1 +router_options=server-id=9993,send_slave_heartbeat=On,user=repl,password=repl,longburst=500,heartbeat=10,binlogdir=/var/lib/maxscale/Binlog_Service,semisync=1,transaction_safety=1,mariadb10-compatibility=1 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog_semisync_txs0_ss0 b/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog_semisync_txs0_ss0 index 13a459c20..4f55f4ec9 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog_semisync_txs0_ss0 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog_semisync_txs0_ss0 @@ -8,9 +8,9 @@ router=binlogrouter #servers=master user=skysql passwd=skysql -version_string=5.6.15-log +#version_string=5.6.15-log #router_options=server-id=3,user=repl,password=repl,master-id=1 -router_options=server-id=3,user=repl,password=repl,longburst=500,heartbeat=30,binlogdir=/var/lib/maxscale/Binlog_Service,semisync=0,transaction_safety=0,mariadb10-compatibility=1 +router_options=server-id=9993,send_slave_heartbeat=On,user=repl,password=repl,longburst=500,heartbeat=10,binlogdir=/var/lib/maxscale/Binlog_Service,semisync=0,transaction_safety=0,mariadb10-compatibility=1 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog_semisync_txs0_ss1 b/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog_semisync_txs0_ss1 index 93098385d..8c0267ddc 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog_semisync_txs0_ss1 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog_semisync_txs0_ss1 @@ -8,9 +8,9 @@ router=binlogrouter #servers=master user=skysql passwd=skysql -version_string=5.6.15-log +#version_string=5.6.15-log #router_options=server-id=3,user=repl,password=repl,master-id=1 -router_options=server-id=3,user=repl,password=repl,longburst=500,heartbeat=30,binlogdir=/var/lib/maxscale/Binlog_Service,semisync=1,transaction_safety=0,mariadb10-compatibility=1 +router_options=server-id=9993,send_slave_heartbeat=On,user=repl,password=repl,longburst=500,heartbeat=10,binlogdir=/var/lib/maxscale/Binlog_Service,semisync=1,transaction_safety=0,mariadb10-compatibility=1 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog_semisync_txs1_ss0 b/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog_semisync_txs1_ss0 index 8e78d9126..20f30f984 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog_semisync_txs1_ss0 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog_semisync_txs1_ss0 @@ -8,9 +8,9 @@ router=binlogrouter #servers=master user=skysql passwd=skysql -version_string=5.6.15-log +#version_string=5.6.15-log #router_options=server-id=3,user=repl,password=repl,master-id=1 -router_options=server-id=3,user=repl,password=repl,longburst=500,heartbeat=30,binlogdir=/var/lib/maxscale/Binlog_Service,semisync=0,transaction_safety=1,mariadb10-compatibility=1 +router_options=server-id=9993,send_slave_heartbeat=On,user=repl,password=repl,longburst=500,heartbeat=10,binlogdir=/var/lib/maxscale/Binlog_Service,semisync=0,transaction_safety=1,mariadb10-compatibility=1 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog_tx_safe b/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog_tx_safe index 33957920a..6a1078fc9 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog_tx_safe +++ b/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog_tx_safe @@ -8,9 +8,9 @@ router=binlogrouter #servers=master user=skysql passwd=skysql -version_string=5.6.15-log +#version_string=5.6.15-log #router_options=server-id=3,user=repl,password=repl,master-id=1 -router_options=server-id=3,user=repl,password=repl,longburst=500,heartbeat=30,binlogdir=/var/lib/maxscale/Binlog_Service,transaction_safety=1,mariadb10-compatibility=1 +router_options=server-id=9993,send_slave_heartbeat=On,user=repl,password=repl,longburst=500,heartbeat=10,binlogdir=/var/lib/maxscale/Binlog_Service,transaction_safety=1,mariadb10-compatibility=1