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

Merge branch '2.3' into 2.4

Browse Source
This commit is contained in:
Markus Mäkelä
2020-07-15 14:20:17 +03:00
parent ea35b62373 c4e79f4d3b
commit 5cf22037db
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
maxscale-system-test/maxtest/include/maxtest/mariadb_func.hh
View File

@ -308,8 +308,14 @@ public:
bool connect() bool connect()
{ {
mysql_close(m_conn); mysql_close(m_conn);
m_conn = open_conn_db(m_port, m_host, m_db, m_user, m_pw, m_ssl); m_conn = mysql_init(NULL);
return m_conn != nullptr && mysql_errno(m_conn) == 0;
// MXS-2568: This fixes mxs1828_double_local_infile
mysql_optionsv(m_conn, MYSQL_OPT_LOCAL_INFILE, (void*)"1");
return mysql_real_connect(m_conn, m_host.c_str(), m_user.c_str(), m_pw.c_str(), m_db.c_str(), m_port,
NULL, CLIENT_MULTI_STATEMENTS)
&& mysql_errno(m_conn) == 0;
} }
void disconnect() void disconnect()