From dd944c7302ca0803f805ce4a4b31587a58d4ad04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= Date: Thu, 20 Jun 2019 08:18:36 +0300 Subject: [PATCH] MXS-2568: Always enable LOCAL INFILE for testing The automatic detection of LOCAL INFILE added in connector-c 3.0.9 requires that the option is enabled explicitly. --- maxscale-system-test/mariadb_func.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maxscale-system-test/mariadb_func.cpp b/maxscale-system-test/mariadb_func.cpp index 2a3c0b047..b814347d2 100644 --- 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);