Merge branch '2.2' into develop

2018-04-10 14:05:39 +03:00
parent 434a71bc4d d22be5dd3e
commit 304499bd36
11 changed files with 140 additions and 55 deletions
--- a/server/modules/protocol/MySQL/mariadb_client.cc
+++ b/server/modules/protocol/MySQL/mariadb_client.cc
@ -139,7 +139,7 @@ void LocalClient::process(uint32_t events)
        error();
    }

-    if (m_queue.size() && m_state != VC_ERROR)
+    if (m_queue.size() && m_state != VC_ERROR && m_state != VC_WAITING_HANDSHAKE)
    {
        drain_queue();
    }