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/mxs1506_delayed_retry.cpp
+++ b/maxscale-system-test/mxs1506_delayed_retry.cpp
@ -43,7 +43,7 @@ int main(int argc, char** argv)

    auto ok = [&test, &query](string q, int t = 0) {
            test.expect(query(q, t),
-                        "Query '%' should work: %s",
+                        "Query '%s' should work: %s",
                        q.c_str(),
                        mysql_error(test.maxscales->conn_rwsplit[0]));
        };