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

fix for root master NULL pinter

Browse Source 
fix for  root master NULL pinter
This commit is contained in:
MassimilianoPinto
2014-06-30 19:09:50 +02:00
parent f5e6f99ba7
commit dd54dde4ef
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
server/modules/monitor/mysql_mon.c
View File

@ -340,8 +340,6 @@ char *uname = handle->defaultUser;
char *passwd = handle->defaultPasswd; char *passwd = handle->defaultPasswd;
unsigned long int server_version = 0; unsigned long int server_version = 0;
char *server_string; char *server_string;
unsigned long id = handle->id;
int replication_heartbeat = handle->replicationHeartbeat;
if (database->server->monuser != NULL) if (database->server->monuser != NULL)
{ {
@ -1038,11 +1036,19 @@ static MONITOR_SERVERS *get_replication_tree(MYSQL_MONITOR *handle, int num_serv
ptr = ptr->next; ptr = ptr->next;
} }
/* If root master is in MAINT, return NULL */ /*
if (SERVER_IN_MAINT(handle->master->server)) { * Return the root master
*/
if (handle->master != NULL) {
/* If the root master is in MAINT, return NULL */
if (SERVER_IN_MAINT(handle->master->server)) {
return NULL;
} else {
return handle->master;
}
} else {
return NULL; return NULL;
} else {
return handle->master;
} }
} }