Merge branch '2.2' into develop

2018-08-30 11:36:58 +03:00
parent 9c3dc76fa9 4c5e18b4f0
commit a13e95951b
47 changed files with 323 additions and 156 deletions
--- a/maxscale-system-test/mxs1713_lots_of_databases.cpp
+++ b/maxscale-system-test/mxs1713_lots_of_databases.cpp
@ -35,7 +35,7 @@ int main(int argc, char** argv)
        MYSQL* conn = open_conn_db(test.maxscales->port(), test.maxscales->ip(), db,
                                   test.maxscales->user_name, test.maxscales->password);
        if (execute_query_silent(conn, "SELECT 1") ||
-            execute_query_silent(conn, "SHOW DATABASES"))
+                execute_query_silent(conn, "SHOW DATABASES"))
        {
            errors.insert(mysql_error(conn));
        }