Merge branch 'github/10.0-galera' into 10.1

1 files changed, 2 insertions, 0 deletions

diff --git a/sql/mdl.h b/sql/mdl.h
index a80de5a4e71..7961f1f24b2 100644
--- a/sql/mdl.h
+++ b/sql/mdl.h
@@ -458,6 +458,7 @@ public:
   MDL_key key;
 
 public:
+
   static void *operator new(size_t size, MEM_ROOT *mem_root) throw ()
   { return alloc_root(mem_root, size); }
   static void operator delete(void *ptr, MEM_ROOT *mem_root) {}
@@ -930,6 +931,7 @@ private:
 
 public:
   THD *get_thd() const { return m_owner->get_thd(); }
+  bool has_explicit_locks();
   void find_deadlock();
 
   ulong get_thread_id() const { return thd_get_thread_id(get_thd()); }