Merge branch '2.2' into develop

2018-07-26 11:27:09 +03:00
parent fbce38878b 571d52f557
commit 6c59da77fb
29 changed files with 409 additions and 417 deletions
--- a/server/modules/filter/tee/teesession.cc
+++ b/server/modules/filter/tee/teesession.cc
@ -101,7 +101,9 @@ TeeSession* TeeSession::create(Tee* my_instance, MXS_SESSION* session)
            return NULL;
        }

-        if ((client = LocalClient::create(session, my_instance->get_service())) == NULL)
+        if ((client = LocalClient::create((MYSQL_session*)session->client_dcb->data,
+                                          (MySQLProtocol*)session->client_dcb->protocol,
+                                          my_instance->get_service())) == NULL)
        {
            return NULL;
        }