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

MXS-1249: Modifications after rebase on develop

Browse Source
This commit is contained in:
Johan Wikman
2017-06-19 14:04:10 +03:00
parent 1034cc51be
commit 4e73aecdef
7 changed files with 12 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/modules/monitor/galeramon/galeramon.c
View File

@ -315,7 +315,7 @@ monitorDatabase(MXS_MONITOR *mon, MXS_MONITOR_SERVERS *database)
/* get server version string */
mxs_mysql_set_server_version(database->con, database->server);
server_string = database->server->server_string;
server_string = database->server->version_string;
/* Check if the the Galera FSM shows this node is joined to the cluster */
char *cluster_member = "SHOW STATUS WHERE Variable_name IN"

2
server/modules/monitor/mmmon/mmmon.c
View File

@ -263,7 +263,7 @@ monitorDatabase(MXS_MONITOR* mon, MXS_MONITOR_SERVERS *database)
/* get server version string */
mxs_mysql_set_server_version(database->con, database->server);
server_string = database->server->server_string;
server_string = database->server->version_string;
/* get server_id form current node */
if (mysql_query(database->con, "SELECT @@server_id") == 0

2
server/modules/monitor/mysqlmon/mysql_mon.c
View File

@ -728,7 +728,7 @@ monitorDatabase(MXS_MONITOR *mon, MXS_MONITOR_SERVERS *database)
/* get server version string */
mxs_mysql_set_server_version(database->con, database->server);
server_string = database->server->server_string;
server_string = database->server->version_string;
MYSQL_SERVER_INFO *serv_info = hashtable_fetch(handle->server_info, database->server->unique_name);
ss_dassert(serv_info);

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

@ -226,7 +226,7 @@ monitorDatabase(MXS_MONITOR_SERVERS *database, char *defaultUser, char *defaultP
/* get server version string */
mxs_mysql_set_server_version(database->con, database->server);
server_string = database->server->server_string;
server_string = database->server->version_string;
/* Check if the the SQL node is able to contact one or more data nodes */
if (mysql_query(database->con, "SHOW STATUS LIKE 'Ndb_number_of_ready_data_nodes'") == 0