Merge branch '2.2' into develop

2018-06-15 10:48:07 +03:00
parent 34c33ce798 37139dfe69
commit a812e02ba4
6 changed files with 66 additions and 1 deletions
--- a/server/modules/protocol/MySQL/mysql_common.cc
+++ b/server/modules/protocol/MySQL/mysql_common.cc
@ -1726,6 +1726,7 @@ static bool kill_func(DCB *dcb, void *data)
            else
            {
                // DCB is not yet connected, send a hangup to forcibly close it
+                dcb->session->close_reason = SESSION_CLOSE_KILLED;
                poll_fake_hangup_event(*it);
            }
        }