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

Merge branch '2.2-mrm' into develop

Browse Source
This commit is contained in:
Markus Mäkelä
2017-10-03 15:15:52 +03:00
parent e9070216fc 613994ca8a
commit 305f01f3e2
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
maxscale-system-test/kerberos_setup.cpp
View File

@ -135,7 +135,7 @@ int main(int argc, char *argv[])
for (int i = 0; i < Test->repl->N; i++) for (int i = 0; i < Test->repl->N; i++)
{ {
Test->repl->ssh_node(i, "sudo rm -f /etc/my.cnf.d/kerb.cnf", true); Test->repl->ssh_node(i, true, "sudo rm -f /etc/my.cnf.d/kerb.cnf");
} }
int rval = Test->global_result; int rval = Test->global_result;

1
maxscale-system-test/testconnections.cpp
View File

@ -1026,6 +1026,7 @@ int TestConnections::start_binlog()
fflush(stdout); fflush(stdout);
tprintf("Maxscale binlog master pos : %s\n", log_pos); tprintf("Maxscale binlog master pos : %s\n", log_pos);
fflush(stdout); fflush(stdout);
}
tprintf("Setup all backend nodes except first one to be slaves of binlog Maxscale node\n"); tprintf("Setup all backend nodes except first one to be slaves of binlog Maxscale node\n");
fflush(stdout); fflush(stdout);