Merge branch '2.3' into 2.4

system-test/mxs1773_failing_ldli.cpp

@@ -0,0 +1,22 @@
+/**
+ * MXS-1773: Failing LOAD DATA LOCAL INFILE confuses readwritesplit
+ *
+ * https://jira.mariadb.org/browse/MXS-1773
+ */
+#include <maxtest/testconnections.hh>
+#include <functional>
+
+int main(int argc, char** argv)
+{
+    TestConnections test(argc, argv);
+
+    test.maxscales->connect();
+    auto q = std::bind(execute_query, test.maxscales->conn_rwsplit[0], std::placeholders::_1);
+    q("LOAD DATA LOCAL INFILE '/tmp/this-file-does-not-exist.txt' INTO TABLE this_table_does_not_exist");
+    q("SELECT 1");
+    q("SELECT 2");
+    q("SELECT 3");
+    test.maxscales->disconnect();
+
+    return test.global_result;
+}