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/mariadbbackend/mysql_backend.cc
+++ b/server/modules/protocol/MySQL/mariadbbackend/mysql_backend.cc
@ -601,6 +601,7 @@ static void do_handle_error(DCB *dcb, mxs_error_action_t action, const char *err
     */
    if (!succp)
    {
+        session->close_reason = SESSION_CLOSE_HANDLEERROR_FAILED;
        poll_fake_hangup_event(session->client_dcb);
    }
 }