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

Merge remote-tracking branch 'origin/2.2' into 2.2

Browse Source
This commit is contained in:
Johan Wikman
2018-02-08 13:44:40 +02:00
parent b34e44d34a a6fc2d3f88
commit b91fa7d395
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
server/core/load_utils.cc
View File

@ -24,6 +24,7 @@
#include <string.h> #include <string.h>
#include <dlfcn.h> #include <dlfcn.h>
#include <algorithm> #include <algorithm>
#include <string>
#include <maxscale/modinfo.h> #include <maxscale/modinfo.h>
#include <maxscale/log_manager.h> #include <maxscale/log_manager.h>

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)));