Merge branch 'develop' of https://github.com/skysql/MaxScale into develop

This commit is contained in:
VilhoRaatikka
2014-07-03 19:27:59 +03:00

View File

@ -3618,16 +3618,15 @@ static bool prep_stmt_drop(
* and the SERVER_MASTER bitval * and the SERVER_MASTER bitval
* Servers are checked even if they are in 'maintenance' * Servers are checked even if they are in 'maintenance'
* *
* @param servers The list of servers * @param servers The list of servers
* @param The number of servers * @param router_nservers The number of servers
* @return The Master found * @return The Master found
* *
*/ */
static BACKEND *get_root_master(backend_ref_t *servers, int router_nservers) { static BACKEND *get_root_master(backend_ref_t *servers, int router_nservers) {
int i = 0; int i = 0;
BACKEND * master_host = NULL; BACKEND * master_host = NULL;
/* (1) find root server(s) with lowest replication depth level */
for (i = 0; i< router_nservers; i++) { for (i = 0; i< router_nservers; i++) {
BACKEND* b = NULL; BACKEND* b = NULL;
b = servers[i].bref_backend; b = servers[i].bref_backend;