1
0
mirror of https://github.com/codership/wsrep-lib.git synced 2025-07-28 20:02:00 +03:00

Prefixed cmake WITH_ definitions with WSREP_LIB_ to avoid collisions

with superproject definitions.

Avoid using client_service::do_2pc() in before_commit() to
determine if 2pc is actually happening, will use transaction
states to deduce that. client_service::do_2pc() should be deprecated.

Fixed a compiler warning in db_high_priority_service.cpp.
This commit is contained in:
Teemu Ollakka
2018-10-12 15:55:31 +03:00
parent 94174b06e6
commit 5e5906d598
5 changed files with 41 additions and 19 deletions

View File

@ -433,7 +433,7 @@ int wsrep::transaction::before_commit()
case wsrep::client_state::m_high_priority:
assert(certified());
assert(ordered());
if (client_service_.do_2pc() == false)
if (state() == s_executing || state() == s_replaying)
{
ret = before_prepare(lock) || after_prepare(lock);
}