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

MXS-2196: Rename session states

Browse Source 
Minor renaming of the session state enum values. Also exposed the session
state stringification function in the public header and removed the
stringification macro.
This commit is contained in:
Markus Mäkelä
2018-12-05 14:34:45 +02:00
parent 7aaadfc550
commit 20fe9b9dca
15 changed files with 39 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/modules/protocol/MySQL/mariadbbackend/mysql_backend.cc
View File

@ -624,7 +624,7 @@ static inline bool session_ok_to_route(DCB* dcb)
{
bool rval = false;
if (dcb->session->state == SESSION_STATE_ROUTER_READY
if (dcb->session->state == SESSION_STATE_STARTED
&& dcb->session->client_dcb != NULL
&& dcb->session->client_dcb->state == DCB_STATE_POLLING
&& (dcb->session->router_session
@ -1292,7 +1292,7 @@ static int gw_error_backend_event(DCB* dcb)
}
dcb_close(dcb);
}
else if (dcb->state != DCB_STATE_POLLING || session->state != SESSION_STATE_ROUTER_READY)
else if (dcb->state != DCB_STATE_POLLING || session->state != SESSION_STATE_STARTED)
{
int error;
int len = sizeof(error);
@ -1336,7 +1336,7 @@ static int gw_backend_hangup(DCB* dcb)
if (!dcb->persistentstart)
{
if (session->state != SESSION_STATE_ROUTER_READY)
if (session->state != SESSION_STATE_STARTED)
{
int error;
int len = sizeof(error);