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

Merge branch '2.2' of github.com:mariadb-corporation/MaxScale into 2.2

Browse Source
This commit is contained in:
Markus Mäkelä
2017-10-03 14:46:14 +03:00
parent bd39284f9c 68432bbaa3
commit 27d1be7f96
12 changed files with 187 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -188,7 +188,7 @@ static json_t* diagnostics_json(const MXS_MONITOR *mon)
* @param database The database to probe
*/
static void
monitorDatabase(MXS_MONITOR_SERVERS *database, char *defaultUser, char *defaultPasswd, MXS_MONITOR *mon)
monitorDatabase(MXS_MONITORED_SERVER *database, char *defaultUser, char *defaultPasswd, MXS_MONITOR *mon)
{
MYSQL_ROW row;
MYSQL_RES *result;
@ -308,7 +308,7 @@ monitorMain(void *arg)
{
MYSQL_MONITOR *handle = (MYSQL_MONITOR*)arg;
MXS_MONITOR* mon = handle->monitor;
MXS_MONITOR_SERVERS *ptr;
MXS_MONITORED_SERVER *ptr;
size_t nrounds = 0;
if (mysql_thread_init())
@ -350,7 +350,7 @@ monitorMain(void *arg)
lock_monitor_servers(mon);
servers_status_pending_to_current(mon);
ptr = mon->databases;
ptr = mon->monitored_servers;
while (ptr)
{
ptr->mon_prev_status = ptr->server->status;