blr branch merge

2014-09-11 12:20:42 +02:00
parent 190c05da5f f9aece5113
commit 7245d1baa1
30 changed files with 4649 additions and 90 deletions
--- a/server/modules/protocol/mysql_backend.c
+++ b/server/modules/protocol/mysql_backend.c
@ -497,7 +497,7 @@ static int gw_read_backend_event(DCB *dcb) {
                {
                        if (nbytes_read < 5) 
                        {
-                                gwbuf_append(dcb->dcb_readqueue, read_buffer);
+                                dcb->dcb_readqueue = gwbuf_append(dcb->dcb_readqueue, read_buffer);
                                rc = 0;
                                goto return_rc;
                        }