Merge branch 'master' of https://github.com/skysql/MaxScale

2014-04-15 14:35:32 +03:00 · 2014-04-15 14:35:32 +03:00 · ac261a038c
commit ac261a038c
parent c7b7b17e0d a253da7b9c
1 changed files with 7 additions and 0 deletions
--- a/server/core/dcb.c
+++ b/server/core/dcb.c
@ -301,6 +301,13 @@ dcb_final_free(DCB *dcb)
 		free(dcb->data);
 	if (dcb->remote)
 		free(dcb->remote);
+
+	/* Consume dcb->delayq buffer */	
+	if (dcb->delayq) {
+		GWBUF *queue = dcb->delayq;
+		while ((queue = gwbuf_consume(queue, GWBUF_LENGTH(queue))) != NULL);
+	}
+
 	bitmask_free(&dcb->memdata.bitmask);
        simple_mutex_done(&dcb->dcb_read_lock);
        simple_mutex_done(&dcb->dcb_write_lock);