Merge branch '2.1' into develop

2017-07-31 15:57:05 +03:00
parent 39629c412d 95c254a8b0
commit 3eb99139f5
27 changed files with 389 additions and 58 deletions
--- a/server/modules/routing/readwritesplit/readwritesplit.cc
+++ b/server/modules/routing/readwritesplit/readwritesplit.cc
@ -401,8 +401,7 @@ static bool handle_error_new_connection(RWSplit *inst,
         * to the client.
         */
        GWBUF *stored = NULL;
-        const SERVER *target;
-
+        const SERVER *target = NULL;
        if (!session_take_stmt(backend_dcb->session, &stored, &target) ||
            target != backend->backend()->server ||
            !reroute_stored_statement(*rses, backend, stored))