hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed references to SERVER_IS_JOINED status from readwritesplit.c because rwsplit for Galera doesn't use that status at all.

Browse Source
This commit is contained in:
VilhoRaatikka
2014-06-04 14:49:05 +03:00
parent 4dbd51b1fc
commit 7e863657db
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
server/modules/routing/readwritesplit/readwritesplit.c
View File

@ -815,8 +815,7 @@ static bool get_dcb(
BACKEND* b = backend_ref[i].bref_backend; BACKEND* b = backend_ref[i].bref_backend;
if (backend_ref[i].bref_dcb != NULL && if (backend_ref[i].bref_dcb != NULL &&
(SERVER_IS_MASTER(b->backend_server) || (SERVER_IS_MASTER(b->backend_server)))
SERVER_IS_JOINED(b->backend_server)))
{ {
*p_dcb = backend_ref[i].bref_dcb; *p_dcb = backend_ref[i].bref_dcb;
succp = true; succp = true;
@ -1554,8 +1553,7 @@ static bool select_connect_backend_servers(
} }
} }
else if (!master_connected && else if (!master_connected &&
(SERVER_IS_MASTER(b->backend_server) || (SERVER_IS_MASTER(b->backend_server)))
SERVER_IS_JOINED(b->backend_server)))
{ {
master_found = true; master_found = true;
@ -1656,8 +1654,7 @@ static bool select_connect_backend_servers(
"Selected %s in \t%s:%d", "Selected %s in \t%s:%d",
(btype == BE_MASTER ? "master" : (btype == BE_MASTER ? "master" :
(btype == BE_SLAVE ? "slave" : (btype == BE_SLAVE ? "slave" :
(btype == BE_JOINED ? "galera node" : "unknown node type")),
"unknown node type"))),
b->backend_server->name, b->backend_server->name,
b->backend_server->port))); b->backend_server->port)));
} }