Merge branch 'master' into blr

2014-05-19 13:46:47 +01:00
parent 29d247319d
commit 9777e83a5a
50 changed files with 829 additions and 553 deletions
--- a/server/core/dcb.c
+++ b/server/core/dcb.c
@ -308,6 +308,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);