Merge branch '2.2' into develop

2018-10-02 10:18:09 +03:00
parent 6b8443aba6 dad4f55ee6
commit 75f9921ca2
16 changed files with 125 additions and 135 deletions
--- a/maxscale-system-test/mxs1743_rconn_bitmask.cpp
+++ b/maxscale-system-test/mxs1743_rconn_bitmask.cpp
@ -45,8 +45,9 @@ int main(int argc, char** argv)
    test.try_query(test.repl->nodes[0], "%s", "GRANT ALL ON *.* TO 'mxs1743'@'%'");

    test.tprintf("Syncing slaves");
-    test.set_timeout(60);
+    test.stop_timeout();
    test.repl->sync_slaves();
+    test.set_timeout(60);

    test.tprintf("Opening new connections to verify readconnroute works");