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

Merge branch 'develop' into MAX-65

Browse Source
This commit is contained in:
Mark Riddoch
2014-06-04 21:14:31 +01:00
parent 57e910ad3d 7e863657db
commit f612b90cd7
10 changed files with 106 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/core/server.c
View File

@ -344,6 +344,8 @@ char *status = NULL;
if ((status = (char *)malloc(200)) == NULL)
return NULL;
status[0] = 0;
if (server->status & SERVER_MAINT)
strcat(status, "Maintenance, ");
if (server->status & SERVER_MASTER)
strcat(status, "Master, ");
if (server->status & SERVER_SLAVE)