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

Merge branch '2.2' into develop

Browse Source
This commit is contained in:
Esa Korhonen
2018-09-13 13:08:25 +03:00
committed by Timofey Turenko
parent 7ec2f77708 b3d6e49061
commit 8c561c6e55
13 changed files with 34 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
maxscale-system-test/open_close_connections.cpp
View File

@ -77,24 +77,16 @@ void* query_thread1(void* ptr)
{
MYSQL* conn1 = data->Test->maxscales->open_rwsplit_connection(0);
data->Test->add_result(mysql_errno(conn1),
"Error opening RWsplit conn, thread num is %d, iteration %d, error is: %s\n",
data->thread_id,
data->i,
mysql_error(conn1));
MYSQL* conn2 = data->Test->maxscales->open_readconn_master_connection(0);
data->Test->add_result(mysql_errno(
conn2),
"Error opening ReadConn master conn, thread num is %d, iteration %d, error is: %s\n",
data->thread_id,
data->i,
mysql_error(conn2));
MYSQL* conn3 = data->Test->maxscales->open_readconn_slave_connection(0);
data->Test->add_result(mysql_errno(
conn3),
"Error opening ReadConn master conn, thread num is %d, iteration %d, error is: %s\n",
data->thread_id,
data->i,
mysql_error(conn3));
"Error opening RWsplit conn, thread num is %d, iteration %li, error is: %s\n",
data->thread_id, data->i, mysql_error(conn1));
MYSQL *conn2 = data->Test->maxscales->open_readconn_master_connection(0);
data->Test->add_result(mysql_errno(conn2),
"Error opening ReadConn master conn, thread num is %d, iteration %li, error is: %s\n", data->thread_id,
data->i, mysql_error(conn2));
MYSQL *conn3 = data->Test->maxscales->open_readconn_slave_connection(0);
data->Test->add_result(mysql_errno(conn3),
"Error opening ReadConn master conn, thread num is %d, iteration %li, error is: %s\n", data->thread_id,
data->i, mysql_error(conn3));
// USE test here is a hack to prevent Maxscale from failure; should be removed when fixed
if (conn1 != NULL)
{