Merge branch '2.2' into develop

2018-08-30 11:36:58 +03:00
parent 9c3dc76fa9 4c5e18b4f0
commit a13e95951b
47 changed files with 323 additions and 156 deletions
--- a/maxscale-system-test/rw_select_insert.cpp
+++ b/maxscale-system-test/rw_select_insert.cpp
@ -129,7 +129,10 @@ int main(int argc, char *argv[])
    Test->tprintf("Connecting to RWSplit %s\n", Test->maxscales->IP[0]);
    Test->maxscales->connect_rwsplit(0);

-    Test->maxscales->execute_maxadmin_command(0, (char *) "shutdown monitor MySQL-Monitor");
+    for (i = 0; i < Test->maxscales->N; i++)
+    {
+        Test->maxscales->execute_maxadmin_command(i, (char *) "shutdown monitor MySQL-Monitor");
+    }

    get_global_status_allnodes(&selects[0], &inserts[0], Test->repl, silent);