Merge branch 'develop' into 1.2.1-binlog_router_trx

server/modules/monitor/galeramon.c

@@ -401,7 +401,7 @@ char 			*server_string;
 							    " MySQL Version: %s",version_str);
 						    return;
 						}
-					while ((row = mysql_fetch_row(result)))
+					while ((row = mysql_fetch_row(result2)))
 					{
 						if (strncmp(row[1], "xtrabackup", 10) == 0)
 							isjoined = 1;

server/modules/protocol/httpd.c

@@ -383,6 +383,16 @@ int	n_connect = 0;
 static int
 httpd_close(DCB *dcb)
 {
+	if(dcb->dcb_readqueue)
+	{
+	    while((dcb->dcb_readqueue = GWBUF_CONSUME_ALL(dcb->dcb_readqueue)));
+	}
+
+	if(dcb->writeq)
+	{
+	    while((dcb->writeq = GWBUF_CONSUME_ALL(dcb->writeq)));
+	}
+
 	return 0;
 }
 

server/modules/routing/maxinfo/maxinfo.c

@@ -746,6 +746,7 @@ RESULTSET	*set;
 			resultset_free(set);
 		}
 	}
+	gwbuf_free(queue);
 	return 1;
 }