Merge from Z3

2014-09-11 12:51:16 +02:00
parent 7245d1baa1 1154b25bff
commit 8b5b4a17fe
148 changed files with 9288 additions and 811 deletions
--- a/server/modules/routing/debugcmd.c
+++ b/server/modules/routing/debugcmd.c
@ -839,6 +839,7 @@ static struct {
 	{ "master",		SERVER_MASTER },
 	{ "slave",		SERVER_SLAVE },
 	{ "synced",		SERVER_JOINED },
+	{ "ndb",		SERVER_NDB },
 	{ "maintenance",	SERVER_MAINT },
 	{ "maint",		SERVER_MAINT },
 	{ NULL,			0 }