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

MXS-1654 Prevent crash in debug mode if no master is found

Browse Source
This commit is contained in:
Johan Wikman
2018-02-07 13:09:13 +02:00
parent fa8f6a5da3
commit 6c42221c9c
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
server/modules/monitor/mariadbmon/mysql_mon.cc
View File

@ -2373,8 +2373,9 @@ monitorMain(void *arg)
} }
ss_dassert(handle->master == root_master); ss_dassert(handle->master == root_master);
ss_dassert((root_master->server->status & (SERVER_SLAVE | SERVER_MASTER)) ss_dassert(!root_master ||
!= (SERVER_SLAVE | SERVER_MASTER)); ((root_master->server->status & (SERVER_SLAVE | SERVER_MASTER))
!= (SERVER_SLAVE | SERVER_MASTER)));
/** /**
* After updating the status of all servers, check if monitor events * After updating the status of all servers, check if monitor events