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

Fix debug assertion when no master is present

Browse Source 
If no master is present, the debug assertion would dereference a NULL
pointer.
This commit is contained in:
Markus Mäkelä
2018-02-07 17:56:15 +02:00
parent 2a987716a8
commit ed28d986e9
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2372,7 +2372,7 @@ monitorMain(void *arg)
} }
} }
ss_dassert(handle->master == root_master); ss_dassert(root_master == NULL || handle->master == root_master);
ss_dassert(!root_master || ss_dassert(!root_master ||
((root_master->server->status & (SERVER_SLAVE | SERVER_MASTER)) ((root_master->server->status & (SERVER_SLAVE | SERVER_MASTER))
!= (SERVER_SLAVE | SERVER_MASTER))); != (SERVER_SLAVE | SERVER_MASTER)));