Merge branch '2.2' into 2.2-mrm
This commit is contained in:
commit
613994ca8a
@ -135,7 +135,7 @@ int main(int argc, char *argv[])
|
||||
|
||||
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;
|
||||
|
@ -1026,6 +1026,7 @@ int TestConnections::start_binlog()
|
||||
fflush(stdout);
|
||||
tprintf("Maxscale binlog master pos : %s\n", log_pos);
|
||||
fflush(stdout);
|
||||
}
|
||||
|
||||
tprintf("Setup all backend nodes except first one to be slaves of binlog Maxscale node\n");
|
||||
fflush(stdout);
|
||||
|
Loading…
x
Reference in New Issue
Block a user