Merge from Z3

2014-09-11 12:51:16 +02:00
parent 7245d1baa1 1154b25bff
commit 8b5b4a17fe
148 changed files with 9288 additions and 811 deletions
--- a/server/modules/protocol/mysql_backend.c
+++ b/server/modules/protocol/mysql_backend.c
@ -422,7 +422,6 @@ static int gw_read_backend_event(DCB *dcb) {
 		GWBUF         *read_buffer = NULL;
 		ROUTER_OBJECT *router = NULL;
 		ROUTER        *router_instance = NULL;
-		void          *rsession = NULL;
 		SESSION       *session = dcb->session;
                int           nbytes_read = 0;