Merge branch '2.2' into develop

2018-03-12 14:38:37 +02:00
parent 6a8effaea1 aea9c36498
commit 69383c0943
14 changed files with 267 additions and 112 deletions
--- a/server/modules/monitor/mariadbmon/mariadbmon.cc
+++ b/server/modules/monitor/mariadbmon/mariadbmon.cc
@ -1255,6 +1255,7 @@ static bool slave_receiving_events(MariaDBMonitor* handle)
        MySqlServerInfo* info = get_server_info(handle, server);

        if (info->slave_configured &&
+            info->slave_status.slave_io_running &&
            info->slave_status.master_server_id == master_id &&
            difftime(time(NULL), info->latest_event) < handle->master_failure_timeout)
        {