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

Merge branch '2.1' into develop

Browse Source
This commit is contained in:
Markus Mäkelä
2017-08-03 15:51:15 +03:00
parent ae5eb004fe f7b8744460
commit 1f4856cdc5
11 changed files with 88 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/modules/monitor/ndbclustermon/ndbclustermon.c
View File

@ -250,6 +250,10 @@ monitorDatabase(MXS_MONITOR_SERVERS *database, char *defaultUser, char *defaultP
}
mysql_free_result(result);
}
else
{
mon_report_query_error(database);
}
/* Check the the SQL node id in the MySQL cluster */
if (mysql_query(database->con, "SHOW STATUS LIKE 'Ndb_cluster_node_id'") == 0
@ -277,6 +281,10 @@ monitorDatabase(MXS_MONITOR_SERVERS *database, char *defaultUser, char *defaultP
}
mysql_free_result(result);
}
else
{
mon_report_query_error(database);
}
if (isjoined)
{