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-10-29 15:25:21 +02:00
parent 77ef9312c9 46dab1e884
commit 11368e5ed0
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
system-test/backend_auth_fail.cpp
View File

@ -11,7 +11,7 @@ int main(int argc, char** argv)
MYSQL* mysql[1000]; MYSQL* mysql[1000];
TestConnections* Test = new TestConnections(argc, argv); TestConnections* Test = new TestConnections(argc, argv);
Test->repl->execute_query_all_nodes((char*) "set global max_connections = 10;"); Test->repl->execute_query_all_nodes((char*) "set global max_connections = 30;");
for (int x = 0; x < 3; x++) for (int x = 0; x < 3; x++)
{ {
@ -31,10 +31,6 @@ int main(int argc, char** argv)
} }
} }
// Wait for the connections to clean up
Test->stop_timeout();
sleep(2 * Test->repl->N);
Test->check_maxscale_alive(0); Test->check_maxscale_alive(0);
int rval = Test->global_result; int rval = Test->global_result;
delete Test; delete Test;

3
system-test/maxtest/src/mariadb_func.cc
View File

@ -50,6 +50,9 @@ MYSQL* open_conn_db_flags(int port,
set_ssl(conn); set_ssl(conn);
} }
unsigned int timeout = 15;
mysql_options(conn, MYSQL_OPT_CONNECT_TIMEOUT, &timeout);
// MXS-2568: This fixes mxs1828_double_local_infile // MXS-2568: This fixes mxs1828_double_local_infile
mysql_optionsv(conn, MYSQL_OPT_LOCAL_INFILE, (void*)"1"); mysql_optionsv(conn, MYSQL_OPT_LOCAL_INFILE, (void*)"1");