Merge branch '2.2' into develop

maxscale-system-test/cdc_client.cpp

@@ -185,9 +185,8 @@ int main(int argc, char *argv[])
     Test->set_timeout(600);
     Test->maxscales->stop_maxscale(0);
 
-    // Remove old data files and make sure that port 4001 is open
-    Test->maxscales->ssh_node_f(0, true, "rm -rf /var/lib/maxscale/avro;"
-                                "iptables -n -L INPUT|grep 4001 || iptables -I INPUT -p tcp --dport 4001 -j ACCEPT;");
+    // Remove old data files
+    Test->maxscales->ssh_node_f(0, true, "rm -rf /var/lib/maxscale/avro;");
 
     Test->repl->connect();
     execute_query(Test->repl->nodes[0], "DROP TABLE IF EXISTS t1;");

maxscale-system-test/cnf/maxscale.cnf.template.mxs1836_show_eventTimes

@@ -21,4 +21,4 @@ passwd=maxinfo_passwd
 type=listener
 service=MaxInfo
 protocol=MySQLClient
-port=9003
+port=4006

maxscale-system-test/masking/masking_user/t/masking_user.test

@@ -2,8 +2,9 @@
 # Masking User
 #
 # See ../masking_rules.json
-
+--disable_warnings
 drop database if exists maskingdb;
+--enable_warnings
 
 create database maskingdb;
 use maskingdb;

maxscale-system-test/mxs1110_16mb.cpp

@@ -17,17 +17,21 @@ int main(int argc, char *argv[])
     Test->set_timeout(60);
     int chunk_size = 2500000;
     int chunk_num = 5;
+    std::string src_dir = test_dir;
+    std::string masking_rules = src_dir + "/masking/masking_user/masking_rules.json";
+    std::string cache_rules = src_dir + "/cache/cache_basic/cache_rules.json";
+    std::string fw_rules = src_dir + "/fw";
 
-    Test->maxscales->copy_to_node_legacy("./masking/masking_user/masking_rules.json", "~/", 0);
+    Test->maxscales->copy_to_node_legacy(masking_rules.c_str(), "~/", 0);
 
-    Test->maxscales->copy_to_node_legacy("./cache/cache_basic/cache_rules.json", "~/", 0);
+    Test->maxscales->copy_to_node_legacy(cache_rules.c_str(), "~/", 0);
 
     Test->maxscales->ssh_node_f(0, true, "cd %s;"
                        "rm -rf rules;"
                        "mkdir rules;"
                        "chown vagrant:vagrant rules",
                        Test->maxscales->access_homedir[0]);
-    copy_rules(Test, (char *) "rules2", "./fw/");
+    copy_rules(Test, "rules2", fw_rules.c_str());
 
     Test->maxscales->start_maxscale(0);
 

maxscale-system-test/mxs1824_double_cursor.cpp

@@ -18,7 +18,7 @@ void double_cursor(TestConnections& test, MYSQL* conn)
     MYSQL_STMT* stmt1 = mysql_stmt_init(conn);
     const char* query = "SELECT id FROM test.t1";
     int rc = mysql_stmt_prepare(stmt1, query, strlen(query));
-    test.assert(rc == 0, "Prepare should work: %s %s", mysql_stmt_error(stmt1), mysql_error(conn));
+    test.assert(rc == 0, "First prepare should work: %s %s", mysql_stmt_error(stmt1), mysql_error(conn));
     int type = CURSOR_TYPE_READ_ONLY;
     mysql_stmt_attr_set(stmt1, STMT_ATTR_CURSOR_TYPE, &type);
 
@@ -35,7 +35,7 @@ void double_cursor(TestConnections& test, MYSQL* conn)
 
     MYSQL_STMT* stmt2 = mysql_stmt_init(conn);
     rc = mysql_stmt_prepare(stmt2, query, strlen(query));
-    test.assert(rc == 0, "Prepare should work: %s %s", mysql_stmt_error(stmt2), mysql_error(conn));
+    test.assert(rc == 0, "Second prepare should work: %s %s", mysql_stmt_error(stmt2), mysql_error(conn));
     mysql_stmt_attr_set(stmt2, STMT_ATTR_CURSOR_TYPE, &type);
     mysql_stmt_bind_result(stmt2, bind);
 

maxscale-system-test/mxs1836_show_eventTimes.cpp

@@ -22,7 +22,7 @@ namespace
 // Specified in the configuration file.
 char USER[]   = "maxinfo_user";
 char PASSWD[] = "maxinfo_passwd";
-int  PORT     = 9003;
+int  PORT     = 4006;
 
 void run(TestConnections& test, MYSQL* pMysql)
 {
@@ -58,7 +58,7 @@ void run(TestConnections& test, MYSQL* pMysql)
     }
     else
     {
-        test.assert(false, "Executing 'show eventTimes' failed.");
+        test.assert(false, "Executing 'show eventTimes' failed: %s", mysql_error(pMysql));
     }
 }
 

maxscale-system-test/testconnections.cpp

@@ -641,7 +641,7 @@ void TestConnections::init_maxscale(int m)
                           "chmod 664 %s/certs/*.pem;"
                           "chmod a+x %s;"
                           "%s"
-                          "iptables -I INPUT -p tcp --dport 4001 -j ACCEPT;"
+                          "iptables -F INPUT;"
                           "rm -f %s/maxscale.log;"
                           "rm -f %s/maxscale1.log;"
                           "rm -rf /tmp/core* /dev/shm/* /var/lib/maxscale/maxscale.cnf.d/ /var/lib/maxscale/*;"