Merge branch 'develop' into MAX-324

Conflicts: query_classifier/query_classifier.cc
2015-01-15 13:17:42 +02:00
parent c1ed24aa78 88a26f03ab
commit db70163373
7 changed files with 271 additions and 119 deletions
--- a/server/modules/protocol/mysql_backend.c
+++ b/server/modules/protocol/mysql_backend.c
@ -1118,7 +1118,7 @@ gw_backend_hangup(DCB *dcb)
        
 	gwbuf_free(errbuf);
        /** There are no required backends available, close session. */
-        if (!succp) 
+        if (!succp)
        {
 #if defined(SS_DEBUG)                
                LOGIF(LE, (skygw_log_write_flush(