Merge branch '2.3' into 2.4

system-test/regexf_replace_crash.cpp

@@ -0,0 +1,70 @@
+/**
+ * @file bug730.cpp regression case for bug 730 ("Regex filter and shorter than original replacement queries
+ * MaxScale")
+ *
+ * - setup regex filter, add it to all maxscales->routers[0]
+ * @verbatim
+ *  [MySetOptionFilter]
+ *  type=filter
+ *  module=regexfilter
+ *  options=ignorecase
+ *  match=SET OPTION SQL_QUOTE_SHOW_CREATE
+ *  replace=SET SQL_QUOTE_SHOW_CREATE
+ *
+ *  @endverbatim
+ * - try SET OPTION SQL_QUOTE_SHOW_CREATE = 1; against all maxscales->routers[0]
+ * - check if Maxscale alive
+ */
+
+/*
+ *  Markus Mäkelä 2015-02-16 10:25:50 UTC
+ *  Using the following regex filter:
+ *
+ *  [MySetOptionFilter]
+ *  type=filter
+ *  module=regexfilter
+ *  options=ignorecase
+ *  match=SET OPTION SQL_QUOTE_SHOW_CREATE
+ *  replace=SET SQL_QUOTE_SHOW_CREATE
+ *
+ *  Sending the following query hangs MaxScale:
+ *
+ *  SET OPTION SQL_QUOTE_SHOW_CREATE = 1;
+ *
+ *  This happens because modutil_replace_SQL doesn't modify the SQL packet length if the resulting replacement
+ * is shorter.
+ *  Comment 1 Markus Mäkelä 2015-02-16 10:27:20 UTC
+ *  Added SQL packet length modifications to modutil_replace_SQL when the original length is different from
+ * the replacement length.
+ */
+
+
+
+#include <iostream>
+#include <maxtest/testconnections.hh>
+
+int main(int argc, char* argv[])
+{
+    TestConnections* Test = new TestConnections(argc, argv);
+    Test->set_timeout(10);
+
+    Test->maxscales->connect_maxscale(0);
+
+    Test->tprintf("RWSplit: \n");
+    fflush(stdout);
+    Test->try_query(Test->maxscales->conn_rwsplit[0], (char*) "SET OPTION SQL_QUOTE_SHOW_CREATE = 1;");
+    Test->tprintf("ReadConn master: \n");
+    fflush(stdout);
+    Test->try_query(Test->maxscales->conn_master[0], (char*) "SET OPTION SQL_QUOTE_SHOW_CREATE = 1;");
+    Test->tprintf("readConn slave: \n");
+    fflush(stdout);
+    Test->try_query(Test->maxscales->conn_slave[0], (char*) "SET OPTION SQL_QUOTE_SHOW_CREATE = 1;");
+
+    Test->maxscales->close_maxscale_connections(0);
+
+    Test->check_maxscale_alive(0);
+
+    int rval = Test->global_result;
+    delete Test;
+    return rval;
+}