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

Addition to previous fix

Browse Source
This commit is contained in:
VilhoRaatikka
2014-11-11 14:25:34 +02:00
parent 061fa62d29
commit 128d5e3f48
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
server/modules/protocol/mysql_backend.c
View File

@ -392,13 +392,10 @@ static int gw_read_backend_event(DCB *dcb) {
dcb, dcb,
dcb->session))); dcb->session)));
if (session != NULL) spinlock_acquire(&session->ses_lock);
{ session->state = SESSION_STATE_STOPPING;
spinlock_acquire(&session->ses_lock); spinlock_release(&session->ses_lock);
session->state = SESSION_STATE_STOPPING; ss_dassert(dcb->dcb_errhandle_called);
spinlock_release(&session->ses_lock);
}
ss_dassert(dcb->dcb_errhandle_called);
dcb_close(dcb); dcb_close(dcb);
} }
rc = 1; rc = 1;

2
server/modules/protocol/mysql_common.c
View File

@ -1767,7 +1767,7 @@ void protocol_archive_srv_command(
} }
else /*< scan and count history commands */ else /*< scan and count history commands */
{ {
len += 1; len = 1;
while (h1->scom_next != NULL) while (h1->scom_next != NULL)
{ {