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

Merge branch 'develop' into mon_script_test

Browse Source
This commit is contained in:
Markus Makela
2015-05-04 09:14:04 +03:00
parent 1516422458 463cd4a97e
commit c0f14dd33b
85 changed files with 2738 additions and 1285 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/modules/monitor/mysql_mon.c
View File

@ -820,7 +820,7 @@ int log_no_master = 1;
mon_status_changed(root_master) &&
!(root_master->server->status & SERVER_STALE_STATUS))
{
if (root_master->pending_status & (SERVER_MASTER)) {
if (root_master->pending_status & (SERVER_MASTER) && SERVER_IS_RUNNING(root_master->server)) {
if (!(root_master->mon_prev_status & SERVER_STALE_STATUS) &&
!(root_master->server->status & SERVER_MAINT))
{