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

Merge branch '2.2' into 2.3

Browse Source
This commit is contained in:
Johan Wikman
2019-01-11 13:02:43 +02:00
parent 6eeb02d55d 9284e8e64c
commit 34359bdc83
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/Release-Notes/MaxScale-2.2.19-Release-Notes.md
View File

@ -1,4 +1,4 @@
# MariaDB MaxScale 2.2.19 Release Notes # MariaDB MaxScale 2.2.19 Release Notes -- 2019-01-11
Release 2.2.19 is a GA release. Release 2.2.19 is a GA release.

4
maxscale-system-test/mysqlmon_failover_rejoin_old_slave.cpp
View File

@ -152,7 +152,7 @@ void run(TestConnections& test)
cout << "\nStopping master." << endl; cout << "\nStopping master." << endl;
test.repl->stop_node(0); test.repl->stop_node(0);
test.maxscales->wait_for_monitor(); test.maxscales->wait_for_monitor(2);
// server1 (previous master) was taken down, so its state should be /Down/. // server1 (previous master) was taken down, so its state should be /Down/.
// server2 should have been made into master, and server4 should still be down. // server2 should have been made into master, and server4 should still be down.
@ -164,7 +164,7 @@ void run(TestConnections& test)
cout << "\nBringing up slave " << N - 1 << endl; cout << "\nBringing up slave " << N - 1 << endl;
test.repl->start_node(N - 1, (char*)""); test.repl->start_node(N - 1, (char*)"");
test.maxscales->wait_for_monitor(); test.maxscales->wait_for_monitor(2);
// server1 should still be down, server2 still master, and server3 still // server1 should still be down, server2 still master, and server3 still
// a slave. server4 was brought up, so it should have been rejoined and // a slave. server4 was brought up, so it should have been rejoined and