Merge 2.1 in 2.2

2017-11-29 11:30:33 +01:00
parent ba22e3b1db
commit 8a10b72e4d
8 changed files with 195 additions and 25 deletions
--- a/maxscale-system-test/mariadb_nodes.h
+++ b/maxscale-system-test/mariadb_nodes.h
@ -291,7 +291,7 @@ public:
     * @param param command line parameters for DB server start command
     * @return 0 if success
     */
-    int start_node(int node, const char* param);
+    int start_node(int node, const char* param = "");

    /**
     * @brief Check node via ssh and restart it if it is not resposible