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

Bug 172 - Compile errors in Galera Monitor

Browse Source
This commit is contained in:
Mark Riddoch
2013-08-21 17:25:43 +02:00
parent 1a18632920
commit 2135a76f7b
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/modules/monitor/Makefile
View File

@ -34,7 +34,7 @@ LDFLAGS=-shared -L$(LOGPATH) -Wl,-rpath,$(DEST)/lib \
MYSQLSRCS=mysql_mon.c MYSQLSRCS=mysql_mon.c
MYSQLOBJ=$(MYSQLSRCS:.c=.o) MYSQLOBJ=$(MYSQLSRCS:.c=.o)
GALERASRCS=mysql_mon.c GALERASRCS=galera_mon.c
GALERAOBJ=$(GALERASRCS:.c=.o) GALERAOBJ=$(GALERASRCS:.c=.o)
SRCS=$(MYSQLSRCS) SRCS=$(MYSQLSRCS)
OBJ=$(SRCS:.c=.o) OBJ=$(SRCS:.c=.o)

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

@ -50,9 +50,9 @@ static void stopMonitor(void *);
static void registerServer(void *, SERVER *); static void registerServer(void *, SERVER *);
static void unregisterServer(void *, SERVER *); static void unregisterServer(void *, SERVER *);
static void defaultUsers(void *, char *, char *); static void defaultUsers(void *, char *, char *);
static void daignostics(DCB *, void *); static void diagnostics(DCB *, void *);
static MONITOR_OBJECT MyObject = { startMonitor, stopMonitor, registerServer, unregisterServer, defaultUser, daignostics }; static MONITOR_OBJECT MyObject = { startMonitor, stopMonitor, registerServer, unregisterServer, defaultUsers, diagnostics };
/** /**
* Implementation of the mandatory version entry point * Implementation of the mandatory version entry point
@ -114,7 +114,7 @@ MYSQL_MONITOR *handle;
handle->databases = NULL; handle->databases = NULL;
handle->shutdown = 0; handle->shutdown = 0;
handle->defaultUser = NULL; handle->defaultUser = NULL;
handle->deaultPasswd = NULL; handle->defaultPasswd = NULL;
spinlock_init(&handle->lock); spinlock_init(&handle->lock);
} }
handle->tid = thread_start(monitorMain, handle); handle->tid = thread_start(monitorMain, handle);
@ -212,7 +212,7 @@ MONITOR_SERVERS *ptr, *lptr;
* @param arg The monitor handle * @param arg The monitor handle
*/ */
static void static void
diagnostics(DCB *dcbm void *handle) diagnostics(DCB *dcb, void *arg)
{ {
MYSQL_MONITOR *handle = (MYSQL_MONITOR *)arg; MYSQL_MONITOR *handle = (MYSQL_MONITOR *)arg;
MONITOR_SERVERS *db; MONITOR_SERVERS *db;
@ -251,7 +251,7 @@ char *sep;
* @param passwd The default password * @param passwd The default password
*/ */
static void static void
defaultUser(void *arg, char *uname, char *passwd) defaultUsers(void *arg, char *uname, char *passwd)
{ {
MYSQL_MONITOR *handle = (MYSQL_MONITOR *)arg; MYSQL_MONITOR *handle = (MYSQL_MONITOR *)arg;