MDEV-4748 - metadata_lock_info plugin

- restore find_ticket() private status, declare friend function instead
- added metadata_lock_info to DEFAULT_SUITES

2 files changed, 6 insertions, 2 deletions

diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 22eb5d9e057..1e685a25657 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -381,6 +381,7 @@ sub main {
   mtr_report("Logging: $0 ", join(" ", @ARGV));
 
  $DEFAULT_SUITES.= ',' . join(',', qw(
+    metadata_lock_info
     query_response_time
     sequence
     spider
diff --git a/sql/mdl.h b/sql/mdl.h
index 4b24c0b7f59..c7c445c75e1 100644
--- a/sql/mdl.h
+++ b/sql/mdl.h
@@ -904,14 +904,14 @@ private:
   MDL_wait_for_subgraph *m_waiting_for;
 private:
   THD *get_thd() const { return m_owner->get_thd(); }
+  MDL_ticket *find_ticket(MDL_request *mdl_req,
+                          enum_mdl_duration *duration);
   void release_locks_stored_before(enum_mdl_duration duration, MDL_ticket *sentinel);
   void release_lock(enum_mdl_duration duration, MDL_ticket *ticket);
   bool try_acquire_lock_impl(MDL_request *mdl_request,
                              MDL_ticket **out_ticket);
 
 public:
-  MDL_ticket *find_ticket(MDL_request *mdl_req,
-                          enum_mdl_duration *duration);
   void find_deadlock();
 
   ulong get_thread_id() const { return thd_get_thread_id(get_thd()); }
@@ -944,6 +944,9 @@ public:
 private:
   MDL_context(const MDL_context &rhs);          /* not implemented */
   MDL_context &operator=(MDL_context &rhs);     /* not implemented */
+
+  /* metadata_lock_info plugin */
+  friend int i_s_metadata_lock_info_fill_row(MDL_ticket*, void*);
 };