From f738b2e0cbd272cf9eee6b1babf63533640234f9 Mon Sep 17 00:00:00 2001
From: VilhoRaatikka <vilho.raatikka@skysql.com>
Date: Tue, 5 Aug 2014 16:38:00 +0300
Subject: [PATCH] Fix to http://bugs.skysql.com/show_bug.cgi?id=469, connection
 counter leaks in master. Removed redundant counter increments.

---
 .../routing/readwritesplit/readwritesplit.c   | 25 +++++++++++--------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/server/modules/routing/readwritesplit/readwritesplit.c b/server/modules/routing/readwritesplit/readwritesplit.c
index 90132a9f9..9d4b1b8ff 100644
--- a/server/modules/routing/readwritesplit/readwritesplit.c
+++ b/server/modules/routing/readwritesplit/readwritesplit.c
@@ -381,7 +381,7 @@ static void refreshInstance(
          * used in slave selection.
          */
         if (!rlag_enabled)
-        {                                
+        {
                 if (rlag_limited)
                 {
                         LOGIF(LE, (skygw_log_write_flush(
@@ -1132,6 +1132,8 @@ static int routeQuery(
                         break;
                         
                 case MYSQL_COM_STMT_EXECUTE:
+                        /** Parsing is not needed for this type of packet */
+#if defined(NOT_USED)
                         plainsqlbuf = gwbuf_clone_transform(querybuf, 
                                                             GWBUF_TYPE_PLAINSQL);
                         len = GWBUF_LENGTH(plainsqlbuf);
@@ -1140,7 +1142,8 @@ static int routeQuery(
                         memcpy(querystr, startpos, len);
                         memset(&querystr[len], 0, 1);
                         qtype = skygw_query_classifier_get_type(querystr, 0, &mysql);
-                        qtype |= QUERY_TYPE_EXEC_STMT;
+#endif
+                        qtype = QUERY_TYPE_EXEC_STMT;
                         break;
                         
                 case MYSQL_COM_SHUTDOWN:       /**< 8 where should shutdown be routed ? */
@@ -1923,7 +1926,8 @@ static bool select_connect_backend_servers(
                                 }
                         } 
                 }
-        }
+        } /*< log only */
+        
         /**
          * Choose at least 1+min_nslaves (master and slave) and at most 1+max_nslaves 
          * servers from the sorted list. First master found is selected.
@@ -1981,7 +1985,7 @@ static bool select_connect_backend_servers(
                                                 backend_ref[i].bref_state = 0;
                                                 bref_set_state(&backend_ref[i], 
                                                                BREF_IN_USE);
-                                                /** 
+                                               /** 
                                                 * Increase backend connection counter.
                                                 * Server's stats are _increased_ in 
                                                 * dcb.c:dcb_alloc !
@@ -2036,8 +2040,6 @@ static bool select_connect_backend_servers(
                                         bref_set_state(&backend_ref[i], 
                                                        BREF_IN_USE);
                                         /** Increase backend connection counters */
-                                        atomic_add(&b->backend_server->stats.n_current, 1);
-                                        atomic_add(&b->backend_server->stats.n_connections, 1);
                                         atomic_add(&b->backend_conn_count, 1);
                                 }
                                 else
@@ -2666,8 +2668,9 @@ static bool execute_sescmd_in_backend(
                         pthread_self(),
                         dcb->fd,
                         STRPACKETTYPE(cmd))));
+                gwbuf_free(tmpbuf);
         }
-#endif
+#endif /*< SS_DEBUG */
         switch (scur->scmd_cur_cmd->my_sescmd_packet_type) {
                 case MYSQL_COM_CHANGE_USER:
                         rc = dcb->func.auth(
@@ -3065,7 +3068,7 @@ static bool router_option_configured(
         }
         return succp;
 }
-#endif
+#endif /*< NOT_USED */
 
 static void rwsplit_process_router_options(
         ROUTER_INSTANCE* router,
@@ -3346,7 +3349,7 @@ static void print_error_packet(
         {
                 while ((buf = gwbuf_consume(buf, GWBUF_LENGTH(buf))) != NULL);
         }
-#endif
+#endif /*< SS_DEBUG */
 }
 
 static int router_get_servercount(
@@ -3568,10 +3571,10 @@ static prep_stmt_t* prep_stmt_init(
         
         if (pstmt != NULL)
         {
-                #if defined(SS_DEBUG)
+#if defined(SS_DEBUG)
                 pstmt->pstmt_chk_top  = CHK_NUM_PREP_STMT;
                 pstmt->pstmt_chk_tail = CHK_NUM_PREP_STMT;
-                #endif
+#endif
                 pstmt->pstmt_state = PREP_STMT_ALLOC;
                 pstmt->pstmt_type  = type;