Merge branch '2.3' into 2.4

system-test/mxs2115_version_string.cpp

@@ -0,0 +1,21 @@
+/**
+ * MXS-2115: Automatic version string detection doesn't work
+ *
+ * When servers are available, the backend server and Maxscale should return the
+ * same version string.
+ */
+
+#include <maxtest/testconnections.hh>
+
+int main(int argc, char** argv)
+{
+    TestConnections test(argc, argv);
+    test.repl->connect();
+    test.maxscales->connect();
+
+    std::string direct = mysql_get_server_info(test.repl->nodes[0]);
+    std::string mxs = mysql_get_server_info(test.maxscales->conn_rwsplit[0]);
+    test.expect(direct == mxs, "MaxScale sends wrong version: %s != %s", direct.c_str(), mxs.c_str());
+
+    return test.global_result;
+}