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

Fix some leftovers from the SESSION->MXS_SESSION and related renames

Browse Source 
Renames only.
This commit is contained in:
Esa Korhonen
2017-01-18 10:36:18 +02:00
parent 46e9e6f4e7
commit 00f77bbe69
8 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/core/dcb.c
View File

@ -594,7 +594,7 @@ dcb_process_victim_queue(int threadid)
/** After these calls, the DCB should be treated as if it were freed.
* Whether it is actually freed depends on the type of the DCB and how
* many DCBs are linked to it via the SESSION object. */
* many DCBs are linked to it via the MXS_SESSION object. */
dcb->state = DCB_STATE_DISCONNECTED;
dcb_remove_from_list(dcb);
dcb_final_free(dcb);

2
server/modules/protocol/CDC/cdc.c
View File

@ -184,7 +184,7 @@ cdc_read_event(DCB* dcb)
// gwbuf_set_type(head, GWBUF_TYPE_CDC);
// the router will close the client connection
//rc = SESSION_ROUTE_QUERY(session, head);
//rc = MXS_SESSION_ROUTE_QUERY(session, head);
// buffer not handled by router right now, consume it
gwbuf_free(head);

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

@ -674,7 +674,7 @@ static void
clientReply(ROUTER *instance, void *router_session, GWBUF *queue, DCB *backend_dcb)
{
ss_dassert(backend_dcb->session->client_dcb != NULL);
SESSION_ROUTE_REPLY(backend_dcb->session, queue);
MXS_SESSION_ROUTE_REPLY(backend_dcb->session, queue);
}
/**

2
server/modules/routing/readwritesplit/readwritesplit.c
View File

@ -765,7 +765,7 @@ static void clientReply(ROUTER *instance, void *router_session, GWBUF *writebuf,
if (writebuf != NULL && client_dcb != NULL)
{
/** Write reply to client DCB */
SESSION_ROUTE_REPLY(backend_dcb->session, writebuf);
MXS_SESSION_ROUTE_REPLY(backend_dcb->session, writebuf);
}
/** Unlock router session */
rses_end_locked_router_action(router_cli_ses);

2
server/modules/routing/schemarouter/schemarouter.c
View File

@ -2470,7 +2470,7 @@ static void clientReply(ROUTER* instance,
PTR_IS_ERR(cmd) ? "ERR" : PTR_IS_OK(cmd) ? "OK" : "RSET",
state & INIT_UNINT ? "UNINIT" : state & INIT_MAPPING ? "MAPPING" : "READY",
router_cli_ses->rses_client_dcb->session);
SESSION_ROUTE_REPLY(backend_dcb->session, writebuf);
MXS_SESSION_ROUTE_REPLY(backend_dcb->session, writebuf);
}
/** Unlock router session */
rses_end_locked_router_action(router_cli_ses);