Merge branch '2.2' into 2.3

2019-05-17 14:10:28 +03:00
parent bf63698991 ca682a5b1c
commit f94355770f
2 changed files with 22 additions and 0 deletions
--- a/maxscale-system-test/testconnections.cpp
+++ b/maxscale-system-test/testconnections.cpp
@ -476,6 +476,20 @@ TestConnections::TestConnections(int argc, char* argv[])
        }
    }

+    if (mdbci_call_needed)
+    {
+        int ec;
+        char * ver = maxscales->ssh_node_output(0, "maxscale --version-full", false, &ec);
+        if (ec)
+        {
+            tprintf("Error retrival of Maxscale version info");
+        }
+        else
+        {
+            tprintf("Maxscale_full_version_start:\n%s\nMaxscale_full_version_end\n", ver);
+        }
+    }
+
    char str[1024];
    sprintf(str, "mkdir -p LOGS/%s", test_name);
    system(str);