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

Merge branch 'release-1.0GA' into bug_679_fix

Browse Source
This commit is contained in:
Markus Makela
2015-01-02 20:57:28 +02:00
parent 95cd0b93cb a3d5367d55
commit b3d79f7273
8 changed files with 85 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/modules/routing/readconnroute.c
View File

@ -411,12 +411,12 @@ BACKEND *master_host = NULL;
LOGIF(LD, (skygw_log_write(
LOGFILE_DEBUG,
"%lu [newSession] Examine server in port %d with "
"%d connections. Status is %d, "
"%d connections. Status is %s, "
"inst->bitvalue is %d",
pthread_self(),
inst->servers[i]->server->port,
inst->servers[i]->current_connection_count,
inst->servers[i]->server->status,
STRSRVSTATUS(inst->servers[i]->server),
inst->bitmask)));
}
@ -972,7 +972,7 @@ static int handle_state_switch(DCB* dcb,DCB_REASON reason, void * routersession)
SESSION* session = dcb->session;
ROUTER_CLIENT_SES* rses = (ROUTER_CLIENT_SES*)routersession;
SERVICE* service = session->service;
ROUTER* router = service->router;
ROUTER* router = (ROUTER *)service->router;
switch(reason)
{