hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MXS-2568: Always enable LOCAL INFILE for testing

Browse Source 
The automatic detection of LOCAL INFILE added in connector-c 3.0.9
requires that the option is enabled explicitly.
This commit is contained in:
Markus Mäkelä
2019-06-20 08:18:36 +03:00
parent 39df829384
commit dd944c7302
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
maxscale-system-test/mariadb_func.cpp
View File

@ -50,6 +50,9 @@ MYSQL* open_conn_db_flags(int port,
set_ssl(conn); set_ssl(conn);
} }
// MXS-2568: This fixes mxs1828_double_local_infile
mysql_optionsv(conn, MYSQL_OPT_LOCAL_INFILE, (void*)"1");
mysql_real_connect(conn, mysql_real_connect(conn,
ip.c_str(), ip.c_str(),
user.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_READ_TIMEOUT, &timeout);
mysql_options(conn, MYSQL_OPT_WRITE_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) if (ssl)
{ {
set_ssl(conn); set_ssl(conn);