Merge branch '2.2' into 2.3

2019-03-05 04:54:40 +02:00
parent 42b3f970c5 8a0b6005a4
commit 77ef3dd613
25 changed files with 600 additions and 146 deletions
--- a/maxscale-system-test/change_user.cpp
+++ b/maxscale-system-test/change_user.cpp
@ -64,6 +64,5 @@ int main(int argc, char *argv[])
    execute_query_silent(test.repl->nodes[0], "DROP USER user@'%%';");
    execute_query_silent(test.repl->nodes[0], "DROP TABLE test.t1");
    test.repl->disconnect();
-
    return test.global_result;
 }