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

Revert "Use dedicated header in NDBClusterMon"

Browse Source 
This reverts commit b9d80f6061d6b536d7a15febf0367e5f6dba0e84.
This commit is contained in:
Johan Wikman
2018-02-24 15:43:15 +02:00
parent 0bbf0246f9
commit b67ab83486
4 changed files with 33 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,7 +17,7 @@
#define MXS_MODULE_NAME "ndbclustermon"
#include "ndbclustermon.h"
#include "../mysqlmon.h"
#include <maxscale/alloc.h>
#include <maxscale/mysql_utils.h>
@ -103,7 +103,7 @@ MXS_MODULE* MXS_CREATE_MODULE()
static void *
startMonitor(MXS_MONITOR *mon, const MXS_CONFIG_PARAMETER *params)
{
NDBC_MONITOR *handle = mon->handle;
MYSQL_MONITOR *handle = mon->handle;
bool have_events = false, script_error = false;
if (handle != NULL)
@ -113,7 +113,7 @@ startMonitor(MXS_MONITOR *mon, const MXS_CONFIG_PARAMETER *params)
}
else
{
if ((handle = (NDBC_MONITOR *) MXS_MALLOC(sizeof(NDBC_MONITOR))) == NULL)
if ((handle = (MYSQL_MONITOR *) MXS_MALLOC(sizeof(MYSQL_MONITOR))) == NULL)
{
return NULL;
}
@ -154,7 +154,7 @@ startMonitor(MXS_MONITOR *mon, const MXS_CONFIG_PARAMETER *params)
static void
stopMonitor(MXS_MONITOR *mon)
{
NDBC_MONITOR *handle = (NDBC_MONITOR *) mon->handle;
MYSQL_MONITOR *handle = (MYSQL_MONITOR *) mon->handle;
handle->shutdown = 1;
thread_wait(handle->thread);
@ -306,7 +306,7 @@ monitorDatabase(MXS_MONITORED_SERVER *database, char *defaultUser, char *default
static void
monitorMain(void *arg)
{
NDBC_MONITOR *handle = (NDBC_MONITOR*)arg;
MYSQL_MONITOR *handle = (MYSQL_MONITOR*)arg;
MXS_MONITOR* mon = handle->monitor;
MXS_MONITORED_SERVER *ptr;
size_t nrounds = 0;