Merge branch '2.2' into develop

2018-03-09 21:00:16 +02:00
parent f2709ded1c d443e22d1b
commit 885d0af50f
9 changed files with 186 additions and 122 deletions
--- a/server/modules/monitor/mariadbmon/mariadbmon.cc
+++ b/server/modules/monitor/mariadbmon/mariadbmon.cc
@ -1173,7 +1173,7 @@ bool do_show_slave_status(MariaDBMonitor* 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]);