Merge branch 'develop' into MAX-324

2015-03-05 10:45:48 +02:00
parent 561952e1ea d6da4c7501
commit 880adca73e
57 changed files with 4699 additions and 113 deletions
--- a/server/modules/protocol/mysql_backend.c
+++ b/server/modules/protocol/mysql_backend.c
@ -623,9 +623,14 @@ static int gw_write_backend_event(DCB *dcb) {
                if (dcb->writeq != NULL)
                {
                        data = (uint8_t *)GWBUF_DATA(dcb->writeq);
-                        
-                        if (!(MYSQL_IS_COM_QUIT(data)))
+
+			if(dcb->session->client == NULL)
+			{
+				rc = 0;
+			}
+                        else if (!(MYSQL_IS_COM_QUIT(data)))
                        {
+
                                /*< vraa : errorHandle */
                                mysql_send_custom_error(
                                        dcb->session->client,