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

8
maxscale-system-test/mxs1787_slave_reconnection.cpp
View File

@ -64,19 +64,19 @@ int main(int argc, char* argv[])
test.set_timeout(30);
test.assert(mysql_stmt_prepare(stmt, query.c_str(), query.size()) == 0,
test.expect(mysql_stmt_prepare(stmt, query.c_str(), query.size()) == 0,
"Prepared statement failure: %s",
mysql_stmt_error(stmt));
test.assert(mysql_stmt_bind_param(stmt, &bind.bind) == 0,
test.expect(mysql_stmt_bind_param(stmt, &bind.bind) == 0,
"Bind failure: %s",
mysql_stmt_error(stmt));
test.assert(mysql_stmt_execute(stmt) == 0,
test.expect(mysql_stmt_execute(stmt) == 0,
"Execute failure: %s",
mysql_stmt_error(stmt));
mysql_stmt_close(stmt);
test.assert(mysql_query(test.maxscales->conn_rwsplit[0], "SELECT 1") == 0,
test.expect(mysql_query(test.maxscales->conn_rwsplit[0], "SELECT 1") == 0,
"Normal queries should work");
test.maxscales->disconnect();
}