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

2
server/core/server.c
View File

@ -417,6 +417,8 @@ char *status = NULL;
strcat(status, "Slave, ");
if (server->status & SERVER_JOINED)
strcat(status, "Synced, ");
if (server->status & SERVER_NDB)
strcat(status, "NDB, ");
if (server->status & SERVER_RUNNING)
strcat(status, "Running");
else