Merge branch '2.2' into develop

2018-09-13 13:08:25 +03:00
parent 7ec2f77708 b3d6e49061
commit 8c561c6e55
13 changed files with 34 additions and 51 deletions
--- a/maxscale-system-test/mxs922_bad_server.cpp
+++ b/maxscale-system-test/mxs922_bad_server.cpp
@ -59,7 +59,7 @@ void do_query(TestConnections* test, bool should_fail)
        ? "Query was successful when failure was expected."
        : "Query failed when success was expected.";

-    test->add_result(failed == should_fail, msg);
+    test->add_result(failed == should_fail, "%s", msg);
    test->maxscales->close_maxscale_connections(0);

    test->stop_timeout();