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/different_size.cpp
+++ b/maxscale-system-test/different_size.cpp
@ -89,7 +89,7 @@ void different_packet_size(TestConnections* Test, bool binlog)

            char* event = create_event_size(size);
            conn = connect_to_serv(Test, binlog);
-            Test->assert(execute_query_silent(conn, event) == 0, "Query should succeed");
+            Test->expect(execute_query_silent(conn, event) == 0, "Query should succeed");
            free(event);
            execute_query_silent(conn, (char*) "DELETE FROM test.large_event");
            mysql_close(conn);