Merge branch '2.3' into 2.4

maxscale-system-test/maxtest/src/CMakeLists.txt

@@ -1,6 +1,5 @@
 add_library(maxtest SHARED
         big_load.cc
-        big_transaction.cc
         blob_test.cc
         clustrix_nodes.cpp
         config_operations.cc

maxscale-system-test/maxtest/src/big_load.cc

@@ -1,5 +1,10 @@
 #include "big_load.h"
+
 #include <pthread.h>
+#include "testconnections.h"
+#include "sql_t1.h"
+#include "get_com_select_insert.h"
+
 
 void load(long int* new_inserts,
           long int* new_selects,

maxscale-system-test/maxtest/src/big_transaction.cc

@@ -1,23 +0,0 @@
-#include "big_transaction.h"
-
-int big_transaction(MYSQL* conn, int N)
-{
-    int local_result = 0;
-    char sql[1000000];
-    local_result += create_t1(conn);
-    local_result += execute_query(conn, (char*) "START TRANSACTION");
-    local_result += execute_query(conn, (char*) "SET autocommit = 0");
-
-    for (int i = 0; i < N; i++)
-    {
-        create_insert_string(sql, 10000, i);
-        local_result += execute_query(conn, "%s", sql);
-        local_result += execute_query(conn, "CREATE TABLE t2(id int);");
-        local_result += execute_query(conn, "%s", sql);
-        local_result += execute_query(conn, "DROP TABLE t2;");
-        local_result += execute_query(conn, "%s", sql);
-    }
-
-    local_result += execute_query(conn, (char*) "COMMIT");
-    return local_result;
-}

maxscale-system-test/maxtest/src/fw_copy_rules.cc

@@ -1,5 +1,6 @@
 #include "fw_copy_rules.h"
 #include <sstream>
+#include "testconnections.h"
 
 void copy_rules(TestConnections* Test, const char* rules_name, const char* rules_dir)
 {

maxscale-system-test/maxtest/src/get_com_select_insert.cc

@@ -1,4 +1,4 @@
-#include "testconnections.h"
+#include "mariadb_nodes.h"
 
 /**
  *  Reads COM_SELECT and COM_INSERT variables from all nodes and stores into 'selects' and 'inserts'

maxscale-system-test/maxtest/src/keepalived_func.cc

@@ -1,5 +1,6 @@
 #include "keepalived_func.h"
 #include "get_my_ip.h"
+#include "testconnections.h"
 
 char* print_version_string(TestConnections* Test)
 {

maxscale-system-test/maxtest/src/mariadb_nodes.cc

@@ -11,7 +11,6 @@
  */
 
 #include "mariadb_nodes.h"
-#include "sql_const.h"
 #include <climits>
 #include <string>
 #include <sstream>
@@ -28,6 +27,27 @@ using std::endl;
 namespace
 {
 static bool g_require_gtid = false;
+
+const char setup_slave_no_pos[] =
+    "change master to MASTER_HOST='%s', "
+    "MASTER_USER='repl', "
+    "MASTER_PASSWORD='repl', "
+    "MASTER_LOG_FILE='mar-bin.000001', "
+    "MASTER_LOG_POS=4, "
+    "MASTER_PORT=%d";
+
+const char setup_slave[] =
+    "change master to MASTER_HOST='%s', "
+    "MASTER_USER='repl', "
+    "MASTER_PASSWORD='repl', "
+    "MASTER_LOG_FILE='%s', "
+    "MASTER_LOG_POS=%s, "
+    "MASTER_PORT=%d; "
+    "start slave;";
+
+const char create_repl_user[] =
+    "grant replication slave on *.* to repl@'%%' identified by 'repl'; "
+    "FLUSH PRIVILEGES";
 }
 
 void Mariadb_nodes::require_gtid(bool value)

maxscale-system-test/maxtest/src/maxscales.cc

@@ -1,9 +1,12 @@
 #include "maxscales.hh"
-#include <sstream>
-#include <unordered_map>
 #include <string>
 #include "envv.hh"
 
+#define DEFAULT_MAXSCALE_CNF "/etc/maxscale.cnf"
+#define DEFAULT_MAXSCALE_LOG_DIR "/var/log/maxscale/"
+#define DEFAULT_MAXSCALE_BINLOG_DIR "/var/lib/maxscale/Binlog_Service/"
+#define DEFAULT_MAXADMIN_PASSWORD "mariadb"
+
 Maxscales::Maxscales(const char *pref,
                      const char *test_cwd,
                      bool verbose,

maxscale-system-test/maxtest/src/sql_t1.cc

@@ -1,6 +1,8 @@
 #include "sql_t1.h"
 
+#include <cstdio>
 #include <pthread.h>
+#include "mariadb_func.h"
 
 pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
 static char** sql = NULL;