From 121cff7ffa56fa2f66af2bcec2f7e3bbadbb8f1a Mon Sep 17 00:00:00 2001
From: Massimiliano Pinto <massimiliano.pinto@skysql.com>
Date: Mon, 14 Oct 2013 15:29:26 +0200
Subject: [PATCH] Galera cluster status is Synced, all affected files are
 updated

---
 server/core/server.c                                   | 2 +-
 server/modules/monitor/galera_mon.c                    | 2 +-
 server/modules/routing/debugcmd.c                      | 2 +-
 server/modules/routing/readconnroute.c                 | 2 +-
 server/modules/routing/readwritesplit/readwritesplit.c | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/server/core/server.c b/server/core/server.c
index 05126cba3..66b624615 100644
--- a/server/core/server.c
+++ b/server/core/server.c
@@ -244,7 +244,7 @@ char	*status = NULL;
 	if (server->status & SERVER_SLAVE)
 		strcat(status, "Slave, ");
 	if (server->status & SERVER_JOINED)
-		strcat(status, "Joined, ");
+		strcat(status, "Synced, ");
 	if (server->status & SERVER_RUNNING)
 		strcat(status, "Running");
 	else
diff --git a/server/modules/monitor/galera_mon.c b/server/modules/monitor/galera_mon.c
index fda2521dd..647181eaa 100644
--- a/server/modules/monitor/galera_mon.c
+++ b/server/modules/monitor/galera_mon.c
@@ -309,7 +309,7 @@ char            *uname = defaultUser, *passwd = defaultPasswd;
 		num_fields = mysql_num_fields(result);
 		while ((row = mysql_fetch_row(result)))
 		{
-			if (strncasecmp(row[1], "JOINED", 3) == 0)
+			if (strncasecmp(row[1], "SYNCED", 3) == 0)
 				isjoined = 1;
 		}
 		mysql_free_result(result);
diff --git a/server/modules/routing/debugcmd.c b/server/modules/routing/debugcmd.c
index a4491eb41..fd726480d 100644
--- a/server/modules/routing/debugcmd.c
+++ b/server/modules/routing/debugcmd.c
@@ -544,7 +544,7 @@ static struct {
 	{ "running", 	SERVER_RUNNING },
 	{ "master",	SERVER_MASTER },
 	{ "slave",	SERVER_SLAVE },
-	{ "joined",	SERVER_JOINED },
+	{ "synced",	SERVER_JOINED },
 	{ NULL,		0 }
 };
 /**
diff --git a/server/modules/routing/readconnroute.c b/server/modules/routing/readconnroute.c
index 7c5b1dd65..2c262f2d4 100644
--- a/server/modules/routing/readconnroute.c
+++ b/server/modules/routing/readconnroute.c
@@ -225,7 +225,7 @@ int		i, n;
 				inst->bitmask |= (SERVER_MASTER|SERVER_SLAVE);
 				inst->bitvalue |= SERVER_SLAVE;
 			}
-			else if (!strcasecmp(options[i], "joined"))
+			else if (!strcasecmp(options[i], "synced"))
 			{
 				inst->bitmask |= (SERVER_JOINED);
 				inst->bitvalue |= SERVER_JOINED;
diff --git a/server/modules/routing/readwritesplit/readwritesplit.c b/server/modules/routing/readwritesplit/readwritesplit.c
index 05ef5f0cf..6de5710ba 100644
--- a/server/modules/routing/readwritesplit/readwritesplit.c
+++ b/server/modules/routing/readwritesplit/readwritesplit.c
@@ -227,7 +227,7 @@ static ROUTER* createInstance(
 				router->bitmask |= (SERVER_MASTER|SERVER_SLAVE);
 				router->bitvalue |= SERVER_SLAVE;
 			}
-			else if (!strcasecmp(options[i], "joined"))
+			else if (!strcasecmp(options[i], "synced"))
 			{
 				router->bitmask |= (SERVER_JOINED);
 				router->bitvalue |= SERVER_JOINED;