From d22be5dd3eba0a770895ae84005982fc08cfaaef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= Date: Tue, 10 Apr 2018 13:54:30 +0300 Subject: [PATCH] Fix build failure caused by merge from 2.1 The dcb->thread.id is dcb->poll.thread.id in 2.2. --- server/core/dcb.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/core/dcb.cc b/server/core/dcb.cc index f79806873..2e9133bed 100644 --- a/server/core/dcb.cc +++ b/server/core/dcb.cc @@ -387,7 +387,7 @@ dcb_connect(SERVER *server, MXS_SESSION *session, const char *protocol) { MXS_DEBUG("Looking for persistent connection DCB user %s protocol %s", user, protocol); dcb = server_get_persistent(server, user, session->client_dcb->remote, - protocol, session->client_dcb->thread.id); + protocol, session->client_dcb->poll.thread.id); if (dcb) { /**