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:
Johan Wikman
2018-09-10 12:29:00 +03:00
parent 03017c6aad 6279ab350c
commit edd5ddcc88
63 changed files with 226 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -163,7 +163,7 @@ bool generate_traffic_and_check(TestConnections& test, MYSQL* conn, int insert_c
mysql_query(conn, SELECT);
MYSQL_RES* res = mysql_store_result(conn);
test.assert(res != NULL, "Query did not return a result set");
test.expect(res != NULL, "Query did not return a result set");
if (res)
{
@ -176,14 +176,14 @@ bool generate_traffic_and_check(TestConnections& test, MYSQL* conn, int insert_c
int value_read = strtol(row[0], NULL, 0);
if (value_read != expected_val)
{
test.assert(false, "Query returned %d when %d was expected", value_read, expected_val);
test.expect(false, "Query returned %d when %d was expected", value_read, expected_val);
rval = false;
break;
}
expected_val++;
}
int num_rows = expected_val;
test.assert(num_rows == inserts,
test.expect(num_rows == inserts,
"Query returned %d rows when %d rows were expected",
num_rows,
inserts);