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

    std::string errstr;
    std::accumulate(errors.begin(), errors.end(), errstr, combiner);
-    test.assert(errors.empty(), "None of the queries should fail: %s", errstr.c_str());
+    test.expect(errors.empty(), "None of the queries should fail: %s", errstr.c_str());

    test.tprintf("Dropping databases...");
    for (auto db : db_list)