Merge branch 'develop' into MXS-544

2016-02-29 10:18:49 +02:00
parent f03865f32a 87ccff097d
commit bf24f18805
128 changed files with 6094 additions and 3949 deletions
--- a/server/modules/protocol/mysql_client.c
+++ b/server/modules/protocol/mysql_client.c
@ -597,7 +597,9 @@ int gw_read_client_event(DCB* dcb)
        }
    }

-    if (stmt_input)
+    /** If the router requires statement input or we are still authenticating
+     * we need to make sure that a complete SQL packet is read before continuing */
+    if (stmt_input || protocol->protocol_auth_state == MYSQL_AUTH_SENT)
    {

        /**