From b098b7a84c374ee7e5a133cbf16be643609c1543 Mon Sep 17 00:00:00 2001 From: Seppo Jaakola Date: Wed, 27 Nov 2013 00:18:44 +0200 Subject: bzr merge -r3904..3928 lp:codership-mysql/5.5 This is now otherwise on level wsrep-25.9, but storage/innobase has not been fully merged wsrep-5.5 is not good source for that, so we probably have to cherry pick innodb changes from wsrep-5.6 --- sql/mdl.h | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'sql/mdl.h') diff --git a/sql/mdl.h b/sql/mdl.h index 498c9fc3ba3..8d22eff1eff 100644 --- a/sql/mdl.h +++ b/sql/mdl.h @@ -770,6 +770,13 @@ public: m_tickets[MDL_EXPLICIT].is_empty()); } +#ifdef WITH_WSREP + inline bool has_transactional_locks() const + { + return !m_tickets[MDL_TRANSACTION].is_empty(); + } +#endif /* WITH_WSREP */ + MDL_savepoint mdl_savepoint() { return MDL_savepoint(m_tickets[MDL_STATEMENT].front(), -- cgit v1.2.1