Merge branch 'develop' of github.com:skysql/MaxScale into develop

Conflicts:
	server/core/session.c
	server/modules/protocol/mysql_backend.c
	server/modules/routing/readwritesplit/readwritesplit.c

Resolved.

Addition of user in topfilter report and general tidyup

server/modules/routing/GaleraHACRoute.c

@@ -58,12 +58,14 @@ static	void 	GHACloseSession(ROUTER *instance, void *router_session);
 static	void 	GHAFreeSession(ROUTER *instance, void *router_session);
 static	int	GHARouteQuery(ROUTER *instance, void *router_session, GWBUF *queue);
 static	void	GHADiagnostics(ROUTER *instance, DCB *dcb);
+
 static  void    GHAClientReply(
         ROUTER  *instance,
         void    *router_session,
         GWBUF   *queue,
         DCB     *backend_dcb);
-static  void    GHAErrorReply(
+
+static  void    GHAHandleError(
         ROUTER  *instance,
         void    *router_session,
         char    *message,
@@ -79,7 +81,7 @@ static ROUTER_OBJECT MyObject = {
     GHARouteQuery,
     GHADiagnostics,
     GHAClientReply,
-    GHAErrorReply
+    GHAHandleError
 };
 
 static bool rses_begin_router_action(
@@ -489,7 +491,7 @@ DCB*              backend_dcb;
                  */
                 if (backend_dcb != NULL) {
                         CHK_DCB(backend_dcb);
-                        backend_dcb->func.close(backend_dcb);
+                        dcb_close(backend_dcb);
                 }
         }
 }
@@ -630,10 +632,9 @@ GHAClientReply(
 }
 
 /**
- * Error Reply routine
+ * Error handling routine
  *
- * The routine will reply to client errors and/or closing the session
- * or try to open a new backend connection.
+ * The routine will handle error occurred in backend.
  *
  * @param       instance        The router instance
  * @param       router_session  The router session
@@ -643,7 +644,7 @@ GHAClientReply(
  *
  */
 static  void
-GHAErrorReply(
+GHAHandleError(
         ROUTER *instance,
         void   *router_session,
         char  *message,

server/modules/routing/debugcli.c

@@ -295,7 +295,7 @@ CLI_SESSION	*session = (CLI_SESSION *)router_session;
 		if (execute_cmd(session))
 			dcb_printf(session->session->client, "MaxScale> ");
 		else
-			session->session->client->func.close(session->session->client);
+                        dcb_close(session->session->client);
 	}
 	return 1;
 }

server/modules/routing/readconnroute.c

@@ -110,12 +110,13 @@ static  void    clientReply(
         void    *router_session,
         GWBUF   *queue,
         DCB     *backend_dcb);
-static  void    errorReply(
+static  void    handleError(
         ROUTER  *instance,
         void    *router_session,
         char    *message,
         DCB     *backend_dcb,
-        int     action);
+        int     action,
+        bool    *succp);
 static  uint8_t getCapabilities (ROUTER* inst, void* router_session);
 
 
@@ -128,7 +129,7 @@ static ROUTER_OBJECT MyObject = {
     routeQuery,
     diagnostics,
     clientReply,
-    errorReply,
+    handleError,
     getCapabilities
 };
 
@@ -551,7 +552,7 @@ DCB*              backend_dcb;
                  */
                 if (backend_dcb != NULL) {
                         CHK_DCB(backend_dcb);
-                        backend_dcb->func.close(backend_dcb);
+                        dcb_close(backend_dcb);
                 }
         }
 }
@@ -692,10 +693,9 @@ clientReply(
 }
 
 /**
- * Error Reply routine
+ * Error Handler routine
  *
- * The routine will reply to client errors and/or closing the session
- * or try to open a new backend connection.
+ * The routine will handle errors that occurred in backend writes.
  *
  * @param       instance        The router instance
  * @param       router_session  The router session
@@ -705,12 +705,13 @@ clientReply(
  *
  */
 static  void
-errorReply(
+handleError(
         ROUTER *instance,
         void   *router_session,
         char   *message,
         DCB    *backend_dcb,
-        int     action)
+        int     action,
+        bool   *succp)
 {
 	DCB		*client = NULL;
 	SESSION         *session = backend_dcb->session;