Merge branch '2.1' into 2.2

2017-12-12 13:23:02 +02:00
parent 6485365b3b 7ebd487ef3
commit 79afaa447e
97 changed files with 5945 additions and 361 deletions
--- a/maxscale-system-test/bulk_insert.cpp
+++ b/maxscale-system-test/bulk_insert.cpp
@ -205,7 +205,6 @@ int main(int argc, char** argv)
    test.maxscales->connect_maxscale(0);
    test.repl->connect();

-
    test.tprintf("Testing column-wise binding with a direct connection");
    test.add_result(bind_by_column(test.repl->nodes[0]), "Bulk inserts with a direct connection should work");
    test.tprintf("Testing column-wise binding with readwritesplit");