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

Fix to bug #438 http://bugs.skysql.com/show_bug.cgi?id=438

Browse Source 
Fixed some compiler warnings, added header includes, return values etc.
This commit is contained in:
VilhoRaatikka
2014-05-27 10:08:17 +03:00
parent d6f0f936ec
commit 70115d35c9
8 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/modules/monitor/mysql_mon.c
View File

@ -128,7 +128,7 @@ MYSQL_MONITOR *handle;
handle->defaultPasswd = NULL;
spinlock_init(&handle->lock);
}
handle->tid = thread_start(monitorMain, handle);
handle->tid = (THREAD)thread_start(monitorMain, handle);
return handle;
}
@ -143,7 +143,7 @@ stopMonitor(void *arg)
MYSQL_MONITOR *handle = (MYSQL_MONITOR *)arg;
handle->shutdown = 1;
thread_wait(handle->tid);
thread_wait((void *)handle->tid);
}
/**

7
server/modules/protocol/mysql_backend.c
View File

@ -283,6 +283,11 @@ static int gw_read_backend_event(DCB *dcb) {
}
if (backend_protocol->state == MYSQL_AUTH_FAILED) {
/**
* protocol state won't change anymore,
* lock can be freed
*/
spinlock_release(&dcb->authlock);
spinlock_acquire(&dcb->delayqlock);
/*<
* vraa : errorHandle
@ -351,7 +356,7 @@ static int gw_read_backend_event(DCB *dcb) {
/* close router_session */
router->closeSession(router_instance, rsession);
rc = 1;
goto return_with_lock;
goto return_rc;
}
else
{