Merge branch '2.1' into 2.2

2018-02-02 15:31:18 +02:00
parent d7d2d3349d facb8d60f7
commit e1f1d8e58a
15 changed files with 597 additions and 11 deletions
--- a/maxscale-system-test/mxs1516.cpp
+++ b/maxscale-system-test/mxs1516.cpp
@ -20,7 +20,8 @@ int main(int argc, char** argv)
    // Give the monitor some time to detect it
    sleep(5);

-    test.add_result(execute_query_silent(test.maxscales->conn_master[0], "SELECT 1") == 0, "Query should fail");
+    test.add_result(execute_query_silent(test.maxscales->conn_master[0], "SELECT 1") == 0,
+                    "Query should fail");

    // Change the master back to the original one
    test.repl->change_master(0, 1);