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

1
server/modules/routing/debugcmd.c
View File

@ -831,6 +831,7 @@ static struct {
{ "master", SERVER_MASTER },
{ "slave", SERVER_SLAVE },
{ "synced", SERVER_JOINED },
{ "ndb", SERVER_NDB },
{ "maintenance", SERVER_MAINT },
{ "maint", SERVER_MAINT },
{ NULL, 0 }

7
server/modules/routing/readconnroute.c
View File

@ -311,6 +311,11 @@ char *weightby;
inst->bitmask |= (SERVER_JOINED);
inst->bitvalue |= SERVER_JOINED;
}
else if (!strcasecmp(options[i], "ndb"))
{
inst->bitmask |= (SERVER_NDB);
inst->bitvalue |= SERVER_NDB;
}
else
{
LOGIF(LM, (skygw_log_write(
@ -318,7 +323,7 @@ char *weightby;
"* Warning : Unsupported router "
"option \'%s\' for readconnroute. "
"Expected router options are "
"[slave|master|synced]",
"[slave|master|synced|ndb]",
options[i])));
}
}