From 7e863657db8248bbc97301a8482d77f673079d59 Mon Sep 17 00:00:00 2001 From: VilhoRaatikka Date: Wed, 4 Jun 2014 14:49:05 +0300 Subject: [PATCH] Removed references to SERVER_IS_JOINED status from readwritesplit.c because rwsplit for Galera doesn't use that status at all. --- server/modules/routing/readwritesplit/readwritesplit.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/server/modules/routing/readwritesplit/readwritesplit.c b/server/modules/routing/readwritesplit/readwritesplit.c index ddb0422c7..9fec7e1bd 100644 --- a/server/modules/routing/readwritesplit/readwritesplit.c +++ b/server/modules/routing/readwritesplit/readwritesplit.c @@ -815,8 +815,7 @@ static bool get_dcb( BACKEND* b = backend_ref[i].bref_backend; if (backend_ref[i].bref_dcb != NULL && - (SERVER_IS_MASTER(b->backend_server) || - SERVER_IS_JOINED(b->backend_server))) + (SERVER_IS_MASTER(b->backend_server))) { *p_dcb = backend_ref[i].bref_dcb; succp = true; @@ -1554,8 +1553,7 @@ static bool select_connect_backend_servers( } } else if (!master_connected && - (SERVER_IS_MASTER(b->backend_server) || - SERVER_IS_JOINED(b->backend_server))) + (SERVER_IS_MASTER(b->backend_server))) { master_found = true; @@ -1656,8 +1654,7 @@ static bool select_connect_backend_servers( "Selected %s in \t%s:%d", (btype == BE_MASTER ? "master" : (btype == BE_SLAVE ? "slave" : - (btype == BE_JOINED ? "galera node" : - "unknown node type"))), + "unknown node type")), b->backend_server->name, b->backend_server->port))); }