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

Merge branch 'Z2' of https://github.com/skysql/MaxScale into Z2

Browse Source 
Conflicts:
	server/core/modutil.c
This commit is contained in:
VilhoRaatikka
2014-08-05 18:26:55 +03:00
parent 08b99c121e 490ade606a
commit cf38dad43a
13 changed files with 502 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
utils/skygw_debug.h
View File

@ -235,8 +235,9 @@ typedef enum skygw_chk_t {
#define STRSRVSTATUS(s) ((SERVER_IS_RUNNING(s) && SERVER_IS_MASTER(s)) ? "RUNNING MASTER" : \
((SERVER_IS_RUNNING(s) && SERVER_IS_SLAVE(s)) ? "RUNNING SLAVE" : \
((SERVER_IS_RUNNING(s) && SERVER_IS_JOINED(s)) ? "RUNNING JOINED" : \
((SERVER_IS_RUNNING(s) && SERVER_IS_NDB(s)) ? "RUNNING NDB" : \
((SERVER_IS_RUNNING(s) && SERVER_IN_MAINT(s)) ? "RUNNING MAINTENANCE" : \
(SERVER_IS_RUNNING(s) ? "RUNNING (only)" : "NO STATUS")))))
(SERVER_IS_RUNNING(s) ? "RUNNING (only)" : "NO STATUS"))))))
#define CHK_MLIST(l) { \
ss_info_dassert((l->mlist_chk_top == CHK_NUM_MLIST && \