Merge branch '2.3' into 2.4

system-test/mxs827_write_timeout.cpp

@@ -0,0 +1,43 @@
+/**
+ * @file mxs827_write_timeout "ReadWriteSplit only keeps used connection alive, query crashes after unused
+ * connection times out"
+ * - SET wait_timeout=20
+ * - do only SELECT during 30 seconds
+ * - try INSERT
+ */
+
+#include <iostream>
+#include <unistd.h>
+#include <maxtest/testconnections.hh>
+#include <maxtest/sql_t1.hh>
+
+using namespace std;
+
+int main(int argc, char* argv[])
+{
+    TestConnections* Test = new TestConnections(argc, argv);
+    Test->set_timeout(10);
+    Test->maxscales->connect_maxscale(0);
+
+    Test->try_query(Test->maxscales->conn_rwsplit[0], "SET wait_timeout=20");
+
+    create_t1(Test->maxscales->conn_rwsplit[0]);
+
+    Test->tprintf("Doing reads for 30 seconds");
+    time_t start = time(NULL);
+
+    while (time(NULL) - start < 30)
+    {
+        Test->set_timeout(10);
+        Test->try_query(Test->maxscales->conn_rwsplit[0], "SELECT 1");
+    }
+
+    Test->tprintf("Doing one write");
+    Test->try_query(Test->maxscales->conn_rwsplit[0], "INSERT INTO t1 VALUES (1, 1)");
+
+    Test->check_maxscale_alive(0);
+
+    int rval = Test->global_result;
+    delete Test;
+    return rval;
+}