Merge branch '2.2' into develop

2018-09-20 12:16:55 +03:00
parent 795796c8a2 8c2f6aafcc
commit d8d0b1a29c
9 changed files with 19 additions and 9 deletions
--- a/maxscale-system-test/different_size.cpp
+++ b/maxscale-system-test/different_size.cpp
@ -100,6 +100,7 @@ void different_packet_size(TestConnections* Test, bool binlog)
    Test->tprintf("Restoring max_allowed_packet");
    set_max_packet(Test, binlog, (char*) "set global max_allowed_packet = 1048576;");

+    Test->set_timeout(300);
    conn = connect_to_serv(Test, binlog);
    Test->try_query(conn, "DROP TABLE test.large_event");
    mysql_close(conn);