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

Merge branch '2.2.3' into 2.2

Browse Source
This commit is contained in:
Johan Wikman 2018-03-09 20:50:01 +02:00
commit d443e22d1b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
# MariaDB MaxScale 2.2.3 Release Notes
# MariaDB MaxScale 2.2.3 Release Notes -- 2018-03-09
Release 2.2.3 is a GA release.

2
server/modules/monitor/mariadbmon/mariadbmon.cc
View File

@ -1434,7 +1434,7 @@ static bool do_show_slave_status(MYSQL_MONITOR* mon,
* root master server.
* Please note, there could be no slaves at all if Slave_SQL_Running == 'No'
*/
if (server_version != MYSQL_SERVER_VERSION_51)
if (serv_info->slave_status.slave_io_running && server_version != MYSQL_SERVER_VERSION_51)
{
/* Get Master_Server_Id */
master_server_id = scan_server_id(row[i_master_server_id]);