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

Use service capabilities

Browse Source 
Now the capabilities of routers and filters alike will be honoured.
This commit is contained in:
Johan Wikman
2016-10-21 21:24:53 +03:00
parent bd18a7d8ed
commit 28ecba4022
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -794,7 +794,7 @@ gw_read_and_write(DCB *dcb)
dcb->session->client_dcb != NULL && dcb->session->client_dcb != NULL &&
dcb->session->client_dcb->state == DCB_STATE_POLLING && dcb->session->client_dcb->state == DCB_STATE_POLLING &&
(session->router_session || (session->router_session ||
session->service->router->getCapabilities() & (int)RCAP_TYPE_NO_RSESSION)) service_get_capabilities(session->service) & RCAP_TYPE_NO_RSESSION))
{ {
MySQLProtocol *client_protocol = (MySQLProtocol *)dcb->session->client_dcb->protocol; MySQLProtocol *client_protocol = (MySQLProtocol *)dcb->session->client_dcb->protocol;
if (client_protocol != NULL) if (client_protocol != NULL)

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

@ -837,8 +837,8 @@ gw_read_normal_data(DCB *dcb, GWBUF *read_buffer, int nbytes_read)
return 1; return 1;
} }
/** Ask what type of input the router expects */ /** Ask what type of input the router/filter chain expects */
capabilities = session->service->router->getCapabilities(); capabilities = service_get_capabilities(session->service);
/** Update the current protocol command being executed */ /** Update the current protocol command being executed */
if (!process_client_commands(dcb, nbytes_read, &read_buffer)) if (!process_client_commands(dcb, nbytes_read, &read_buffer))