Merge branch '2.3' into 2.4

system-test/mxs1123.cpp

@@ -0,0 +1,23 @@
+/**
+ * MXS-1123: connect_timeout setting causes frequent disconnects
+ */
+
+#include <maxtest/testconnections.hh>
+
+int main(int argc, char** argv)
+{
+    TestConnections test(argc, argv);
+    test.maxscales->connect_maxscale(0);
+
+    test.tprintf("Waiting one second between queries, all queries should succeed");
+
+    sleep(1);
+    test.try_query(test.maxscales->conn_rwsplit[0], "select 1");
+    sleep(1);
+    test.try_query(test.maxscales->conn_master[0], "select 1");
+    sleep(1);
+    test.try_query(test.maxscales->conn_slave[0], "select 1");
+
+    test.maxscales->close_maxscale_connections(0);
+    return test.global_result;
+}