From 1c4ffd2599fd31606399011d817cd6730eb35032 Mon Sep 17 00:00:00 2001
From: VilhoRaatikka <vilho.raatikka@skysql.com>
Date: Mon, 17 Nov 2014 14:55:13 +0200
Subject: [PATCH] Fix to bug #597, http://bugs.skysql.com/show_bug.cgi?id=597
 Changed the order of include directives in query_classifier.cc

---
 query_classifier/query_classifier.cc                 | 12 ++++++------
 .../modules/routing/readwritesplit/readwritesplit.c  |  1 -
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/query_classifier/query_classifier.cc b/query_classifier/query_classifier.cc
index be25f239e..68db27e32 100644
--- a/query_classifier/query_classifier.cc
+++ b/query_classifier/query_classifier.cc
@@ -30,12 +30,6 @@
 # undef MYSQL_CLIENT
 #endif
 
-#include <query_classifier.h>
-#include "../utils/skygw_types.h"
-#include "../utils/skygw_debug.h"
-#include <log_manager.h>
-#include <mysql_client_server_protocol.h>
-
 #include <mysql.h>
 #include <my_sys.h>
 #include <my_global.h>
@@ -55,6 +49,12 @@
 #include <strfunc.h>
 #include <item_func.h>
 
+#include "../utils/skygw_types.h"
+#include "../utils/skygw_debug.h"
+#include <log_manager.h>
+#include <query_classifier.h>
+#include <mysql_client_server_protocol.h>
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/server/modules/routing/readwritesplit/readwritesplit.c b/server/modules/routing/readwritesplit/readwritesplit.c
index aad5c3040..9352fe650 100644
--- a/server/modules/routing/readwritesplit/readwritesplit.c
+++ b/server/modules/routing/readwritesplit/readwritesplit.c
@@ -1073,7 +1073,6 @@ static bool get_dcb(
 {
         backend_ref_t* backend_ref;
 	backend_ref_t* master_bref;
-        int            smallest_nconn = -1;
         int            i;
         bool           succp = false;
 	BACKEND*       master_host;