Merge branch '2.2' into develop

2018-09-10 12:29:00 +03:00
parent 03017c6aad 6279ab350c
commit edd5ddcc88
63 changed files with 226 additions and 226 deletions
--- a/maxscale-system-test/mxs359_error_on_write.cpp
+++ b/maxscale-system-test/mxs359_error_on_write.cpp
@ -118,7 +118,7 @@ int main(int argc, char** argv)
            for (auto q : t.queries)
            {
                int rc = execute_query_silent(test.maxscales->conn_rwsplit[0], q.query);
-                test.assert(q.should_work == (rc == 0),
+                test.expect(q.should_work == (rc == 0),
                            "Step '%s': Query '%s' should %s: %s",
                            i.description,
                            q.query,