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/mxs1507_trx_replay.cpp
View File

@ -19,19 +19,19 @@ int main(int argc, char** argv)
};
auto ok = [&](string q) {
test.assert(query(q),
test.expect(query(q),
"Query '%s' should work: %s",
q.c_str(),
mysql_error(test.maxscales->conn_rwsplit[0]));
};
auto err = [&](string q) {
test.assert(!query(q), "Query should not work: %s", q.c_str());
test.expect(!query(q), "Query should not work: %s", q.c_str());
};
auto check = [&](string q, string res) {
Row row = get_row(test.maxscales->conn_rwsplit[0], q.c_str());
test.assert(!row.empty() && row[0] == res,
test.expect(!row.empty() && row[0] == res,
"Query '%s' should return 1: %s (%s)",
q.c_str(),
row.empty() ? "<empty>" : row[0].c_str(),