change cnfs for binlog tests

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]

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]

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
 
 
 

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
 
 
 

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
 
 
 

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
 
 
 

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
 
 
 

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
 
 
 

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