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

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

@ -122,8 +122,7 @@ void test2(TestConnections& test)
test.add_result(strcmp(buffer1, buffer2) == 0, "Expected results to differ");
test.add_result(strcmp(buffer2, server_id) != 0,
"Expected prepare 2 to go to the master (%s) but it's %s",
server_id[0],
buffer2);
server_id, buffer2);
}
void test3(TestConnections& test)
@ -177,8 +176,7 @@ void test3(TestConnections& test)
sprintf(server_id, "%d", test.repl->get_server_id(0));
test.add_result(strcmp(buffer, server_id) != 0,
"Expected the execute inside a transaction to go to the master (%s) but it's %s",
server_id[0],
buffer);
server_id, buffer);
}
int main(int argc, char** argv)