Merge remote-tracking branch 'origin/develop' into MXS-122

2015-06-09 13:51:55 +01:00
parent 393e25e953 9c461450e2
commit 152f9bbc4a
36 changed files with 2333 additions and 1279 deletions
--- a/server/modules/protocol/mysql_common.c
+++ b/server/modules/protocol/mysql_common.c
@ -287,7 +287,7 @@ int gw_read_backend_handshake(
                                        pthread_self(),
                                        conn->owner_dcb->fd,
                                        pthread_self())));
-                                while(head = gwbuf_consume(head, GWBUF_LENGTH(head)));
+                                while((head = gwbuf_consume(head, GWBUF_LENGTH(head))));
 				return 1;
 			}