hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix merge bug

Browse Source 
Unhandled conflict
This commit is contained in:
Johan Wikman
2019-10-29 11:08:52 +02:00
parent 722d269123
commit 9b75ea17ac
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
server/core/session.cc
View File

@ -1179,7 +1179,6 @@ Session::~Session()
mxb::atomic::add(&service->stats.n_current, -1, mxb::atomic::RELAXED); mxb::atomic::add(&service->stats.n_current, -1, mxb::atomic::RELAXED);
mxb_assert(service->stats.n_current >= 0); mxb_assert(service->stats.n_current >= 0);
<<<<<<< HEAD
} }
void Session::set_client_dcb(DCB* dcb) void Session::set_client_dcb(DCB* dcb)
@ -1187,8 +1186,6 @@ void Session::set_client_dcb(DCB* dcb)
mxb_assert(client_dcb == nullptr); mxb_assert(client_dcb == nullptr);
mxb_assert(dcb->role == DCB::Role::CLIENT); mxb_assert(dcb->role == DCB::Role::CLIENT);
client_dcb = dcb; client_dcb = dcb;
=======
>>>>>>> 2.3
} }
namespace namespace