From 9fa059c2a21e8dd5c6164b876f6e38d2622331e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= <markus.makela@mariadb.com>
Date: Tue, 19 Dec 2017 16:51:32 +0200
Subject: [PATCH] Request GTID replication in tests that require it

Added the required calls to request GTID replication in the mysqlmon
failover tests.
---
 maxscale-system-test/mysqlmon_failover_auto.cpp                  | 1 +
 maxscale-system-test/mysqlmon_failover_bad_master.cpp            | 1 +
 maxscale-system-test/mysqlmon_failover_manual.cpp                | 1 +
 maxscale-system-test/mysqlmon_failover_manual2.cpp               | 1 +
 maxscale-system-test/mysqlmon_failover_rejoin_old_slave.cpp      | 1 +
 maxscale-system-test/mysqlmon_failover_rolling_master.cpp        | 1 +
 .../mysqlmon_failover_rolling_restart_slaves.cpp                 | 1 +
 maxscale-system-test/mysqlmon_rejoin_bad.cpp                     | 1 +
 maxscale-system-test/mysqlmon_rejoin_good.cpp                    | 1 +
 9 files changed, 9 insertions(+)

diff --git a/maxscale-system-test/mysqlmon_failover_auto.cpp b/maxscale-system-test/mysqlmon_failover_auto.cpp
index 6de5915dd..61be094cd 100644
--- a/maxscale-system-test/mysqlmon_failover_auto.cpp
+++ b/maxscale-system-test/mysqlmon_failover_auto.cpp
@@ -8,6 +8,7 @@
 int main(int argc, char** argv)
 {
     interactive = strcmp(argv[argc - 1], "interactive") == 0;
+    Mariadb_nodes::require_gtid(true);
     TestConnections test(argc, argv);
 
     // Wait a few seconds
diff --git a/maxscale-system-test/mysqlmon_failover_bad_master.cpp b/maxscale-system-test/mysqlmon_failover_bad_master.cpp
index 80d472163..ec22b1ddf 100644
--- a/maxscale-system-test/mysqlmon_failover_bad_master.cpp
+++ b/maxscale-system-test/mysqlmon_failover_bad_master.cpp
@@ -211,6 +211,7 @@ void run(TestConnections& test)
 
 int main(int argc, char* argv[])
 {
+    Mariadb_nodes::require_gtid(true);
     TestConnections test(argc, argv);
 
     run(test);
diff --git a/maxscale-system-test/mysqlmon_failover_manual.cpp b/maxscale-system-test/mysqlmon_failover_manual.cpp
index cc3fbe70e..8683e7fd5 100644
--- a/maxscale-system-test/mysqlmon_failover_manual.cpp
+++ b/maxscale-system-test/mysqlmon_failover_manual.cpp
@@ -9,6 +9,7 @@ int main(int argc, char** argv)
 {
     const char FAILOVER_CMD[] = "maxadmin call command mysqlmon failover MySQL-Monitor";
     interactive = strcmp(argv[argc - 1], "interactive") == 0;
+    Mariadb_nodes::require_gtid(true);
     TestConnections test(argc, argv);
     int ec;
     // Wait a few seconds
diff --git a/maxscale-system-test/mysqlmon_failover_manual2.cpp b/maxscale-system-test/mysqlmon_failover_manual2.cpp
index a6493c500..b47e20c53 100644
--- a/maxscale-system-test/mysqlmon_failover_manual2.cpp
+++ b/maxscale-system-test/mysqlmon_failover_manual2.cpp
@@ -178,6 +178,7 @@ void run(TestConnections& test)
 
 int main(int argc, char** argv)
 {
+    Mariadb_nodes::require_gtid(true);
     TestConnections test(argc, argv);
 
     try
diff --git a/maxscale-system-test/mysqlmon_failover_rejoin_old_slave.cpp b/maxscale-system-test/mysqlmon_failover_rejoin_old_slave.cpp
index dbd911add..4d546e420 100644
--- a/maxscale-system-test/mysqlmon_failover_rejoin_old_slave.cpp
+++ b/maxscale-system-test/mysqlmon_failover_rejoin_old_slave.cpp
@@ -198,6 +198,7 @@ void run(TestConnections& test)
 
 int main(int argc, char* argv[])
 {
+    Mariadb_nodes::require_gtid(true);
     TestConnections test(argc, argv);
 
     run(test);
diff --git a/maxscale-system-test/mysqlmon_failover_rolling_master.cpp b/maxscale-system-test/mysqlmon_failover_rolling_master.cpp
index 2c55f7c77..cc22ba144 100644
--- a/maxscale-system-test/mysqlmon_failover_rolling_master.cpp
+++ b/maxscale-system-test/mysqlmon_failover_rolling_master.cpp
@@ -256,6 +256,7 @@ void run(XTestConnections& test)
 
 int main(int argc, char* argv[])
 {
+    Mariadb_nodes::require_gtid(true);
     XTestConnections test(argc, argv);
 
     try
diff --git a/maxscale-system-test/mysqlmon_failover_rolling_restart_slaves.cpp b/maxscale-system-test/mysqlmon_failover_rolling_restart_slaves.cpp
index 8cfe437d1..7fa59d0b4 100644
--- a/maxscale-system-test/mysqlmon_failover_rolling_restart_slaves.cpp
+++ b/maxscale-system-test/mysqlmon_failover_rolling_restart_slaves.cpp
@@ -200,6 +200,7 @@ void run(TestConnections& test)
 
 int main(int argc, char* argv[])
 {
+    Mariadb_nodes::require_gtid(true);
     TestConnections test(argc, argv);
 
     run(test);
diff --git a/maxscale-system-test/mysqlmon_rejoin_bad.cpp b/maxscale-system-test/mysqlmon_rejoin_bad.cpp
index 2ddf81735..27477c782 100644
--- a/maxscale-system-test/mysqlmon_rejoin_bad.cpp
+++ b/maxscale-system-test/mysqlmon_rejoin_bad.cpp
@@ -22,6 +22,7 @@ int main(int argc, char** argv)
 {
     char result_tmp[bufsize];
     interactive = strcmp(argv[argc - 1], "interactive") == 0;
+    Mariadb_nodes::require_gtid(true);
     TestConnections test(argc, argv);
     MYSQL* maxconn = test.maxscales->open_rwsplit_connection(0);
 
diff --git a/maxscale-system-test/mysqlmon_rejoin_good.cpp b/maxscale-system-test/mysqlmon_rejoin_good.cpp
index 1b3a16961..9f52b8f25 100644
--- a/maxscale-system-test/mysqlmon_rejoin_good.cpp
+++ b/maxscale-system-test/mysqlmon_rejoin_good.cpp
@@ -18,6 +18,7 @@ using std::string;
 int main(int argc, char** argv)
 {
     interactive = strcmp(argv[argc - 1], "interactive") == 0;
+    Mariadb_nodes::require_gtid(true);
     TestConnections test(argc, argv);
     MYSQL* maxconn = test.maxscales->open_rwsplit_connection(0);
     // Set up test table