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

Clean up router.h

Browse Source 
Nothing moved to core, just rename and cleanup.
This commit is contained in:
Esa Korhonen
2017-01-26 15:36:51 +02:00
parent 74225daf46
commit 8b83bf834e
18 changed files with 229 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
server/modules/protocol/MySQL/MySQLBackend/mysql_backend.c
View File

@ -1122,8 +1122,8 @@ static int gw_error_backend_event(DCB *dcb)
{
MXS_SESSION* session;
void* rsession;
ROUTER_OBJECT* router;
ROUTER* router_instance;
MXS_ROUTER_OBJECT* router;
MXS_ROUTER* router_instance;
GWBUF* errbuf;
bool succp;
mxs_session_state_t ses_state;
@ -1249,8 +1249,8 @@ static int gw_backend_hangup(DCB *dcb)
{
MXS_SESSION* session;
void* rsession;
ROUTER_OBJECT* router;
ROUTER* router_instance;
MXS_ROUTER_OBJECT* router;
MXS_ROUTER* router_instance;
bool succp;
GWBUF* errbuf;
mxs_session_state_t ses_state;
@ -1453,8 +1453,8 @@ static int backend_write_delayqueue(DCB *dcb, GWBUF *buffer)
{
MXS_SESSION *session = dcb->session;
CHK_SESSION(session);
ROUTER_OBJECT *router = session->service->router;
ROUTER *router_instance = session->service->router_instance;
MXS_ROUTER_OBJECT *router = session->service->router;
MXS_ROUTER *router_instance = session->service->router_instance;
void *rsession = session->router_session;
bool succp = false;
GWBUF* errbuf = mysql_create_custom_error(

2
server/modules/protocol/MySQL/MySQLClient/mysql_client.c
View File

@ -1337,7 +1337,7 @@ static int
gw_client_close(DCB *dcb)
{
MXS_SESSION* session;
ROUTER_OBJECT* router;
MXS_ROUTER_OBJECT* router;
void* router_instance;
#if defined(SS_DEBUG)
MySQLProtocol* protocol = (MySQLProtocol *)dcb->protocol;