Merge branch '2.3' into develop

2019-06-20 13:00:13 +03:00
parent 1fbb57f9b2 301b1b63ab
commit 20f595d978
5 changed files with 25 additions and 16 deletions
--- a/maxscale-system-test/mariadb_func.cpp
+++ b/maxscale-system-test/mariadb_func.cpp
@ -50,6 +50,9 @@ MYSQL* open_conn_db_flags(int port,
        set_ssl(conn);
    }

+    // MXS-2568: This fixes mxs1828_double_local_infile
+    mysql_optionsv(conn, MYSQL_OPT_LOCAL_INFILE, (void*)"1");
+
    mysql_real_connect(conn,
                       ip.c_str(),
                       user.c_str(),
@ -81,6 +84,9 @@ MYSQL* open_conn_db_timeout(int port,
    mysql_options(conn, MYSQL_OPT_READ_TIMEOUT, &timeout);
    mysql_options(conn, MYSQL_OPT_WRITE_TIMEOUT, &timeout);

+    // MXS-2568: This fixes mxs1828_double_local_infile
+    mysql_optionsv(conn, MYSQL_OPT_LOCAL_INFILE, (void*)"1");
+
    if (ssl)
    {
        set_ssl(conn);