From ddc7b0fb097373be6bfd1e682495d5528a828424 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= <markus.makela@mariadb.com>
Date: Tue, 30 May 2017 11:48:11 +0300
Subject: [PATCH] Fix more galera test configurations

Some tests used galera options that aren't in 2.0 which caused the tests
to fail.

Also added an upper limit to some tests to reduce excessive execution
times.
---
 maxscale-system-test/binlog_change_master.cpp                 | 3 ++-
 maxscale-system-test/cnf/maxscale.cnf.template.java_prep_stmt | 2 +-
 maxscale-system-test/cnf/maxscale.cnf.template.mxs118         | 2 +-
 maxscale-system-test/cnf/maxscale.cnf.template.mxs361         | 2 +-
 maxscale-system-test/cnf/maxscale.cnf.template.pers_01        | 2 +-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/maxscale-system-test/binlog_change_master.cpp b/maxscale-system-test/binlog_change_master.cpp
index ef59392a7..ae6ed077f 100644
--- a/maxscale-system-test/binlog_change_master.cpp
+++ b/maxscale-system-test/binlog_change_master.cpp
@@ -25,6 +25,7 @@ TestConnections * Test ;
 int exit_flag;
 int master = 0;
 int i_trans = 0;
+const int trans_max = 100;
 int failed_transaction_num = 0;
 
 /** The amount of rows each transaction inserts */
@@ -294,7 +295,7 @@ void *transaction_thread( void *ptr )
     Test->add_result(mysql_errno(conn), "Error connecting to Binlog router, error: %s\n", mysql_error(conn));
     create_t1(conn);
 
-    while ((exit_flag == 0))
+    while ((exit_flag == 0) && i_trans < trans_max)
     {
         Test->tprintf("Transaction %d\n", i_trans);
         trans_result = transaction(conn, i_trans);
diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.java_prep_stmt b/maxscale-system-test/cnf/maxscale.cnf.template.java_prep_stmt
index 5002f8c5f..ec9d0a23f 100644
--- a/maxscale-system-test/cnf/maxscale.cnf.template.java_prep_stmt
+++ b/maxscale-system-test/cnf/maxscale.cnf.template.java_prep_stmt
@@ -10,7 +10,7 @@ servers= server1, server2,server3  ,server4
 user=maxskysql
 passwd= skysql
 monitor_interval=1000
-root_node_as_master=false
+#root_node_as_master=false
 
 [RW Split Router]
 type=service
diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs118 b/maxscale-system-test/cnf/maxscale.cnf.template.mxs118
index 482e34a75..125abd596 100755
--- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs118
+++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs118
@@ -16,7 +16,7 @@ module=galeramon
 servers= server1, server2,server3  ,server4
 user=maxskysql
 passwd= skysql
-root_node_as_master=false
+#root_node_as_master=false
 
 [RW Split Router]
 type=service
diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs361 b/maxscale-system-test/cnf/maxscale.cnf.template.mxs361
index 8f85d4b8a..afa385e01 100755
--- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs361
+++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs361
@@ -86,7 +86,7 @@ servers=gserver1,gserver2,gserver3,gserver4
 user=maxskysql
 passwd=skysql
 monitor_interval=100
-root_node_as_master=false
+#root_node_as_master=false
 
 [server1]
 type=server
diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.pers_01 b/maxscale-system-test/cnf/maxscale.cnf.template.pers_01
index df4e68712..444d53d0d 100755
--- a/maxscale-system-test/cnf/maxscale.cnf.template.pers_01
+++ b/maxscale-system-test/cnf/maxscale.cnf.template.pers_01
@@ -86,7 +86,7 @@ servers=gserver1,gserver2,gserver3,gserver4
 user=maxskysql
 passwd=skysql
 monitor_interval=100
-root_node_as_master=false
+#root_node_as_master=false
 
 [server1]
 type=server