Commit cd342e78 authored by Sergey Vojtovich's avatar Sergey Vojtovich

MDEV-4748 - metadata_lock_info plugin

- restore find_ticket() private status, declare friend function instead
- added metadata_lock_info to DEFAULT_SUITES
parent 4dafdf16
...@@ -381,6 +381,7 @@ sub main { ...@@ -381,6 +381,7 @@ sub main {
mtr_report("Logging: $0 ", join(" ", @ARGV)); mtr_report("Logging: $0 ", join(" ", @ARGV));
$DEFAULT_SUITES.= ',' . join(',', qw( $DEFAULT_SUITES.= ',' . join(',', qw(
metadata_lock_info
query_response_time query_response_time
sequence sequence
spider spider
......
...@@ -904,14 +904,14 @@ class MDL_context ...@@ -904,14 +904,14 @@ class MDL_context
MDL_wait_for_subgraph *m_waiting_for; MDL_wait_for_subgraph *m_waiting_for;
private: private:
THD *get_thd() const { return m_owner->get_thd(); } 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_locks_stored_before(enum_mdl_duration duration, MDL_ticket *sentinel);
void release_lock(enum_mdl_duration duration, MDL_ticket *ticket); void release_lock(enum_mdl_duration duration, MDL_ticket *ticket);
bool try_acquire_lock_impl(MDL_request *mdl_request, bool try_acquire_lock_impl(MDL_request *mdl_request,
MDL_ticket **out_ticket); MDL_ticket **out_ticket);
public: public:
MDL_ticket *find_ticket(MDL_request *mdl_req,
enum_mdl_duration *duration);
void find_deadlock(); void find_deadlock();
ulong get_thread_id() const { return thd_get_thread_id(get_thd()); } ulong get_thread_id() const { return thd_get_thread_id(get_thd()); }
...@@ -944,6 +944,9 @@ class MDL_context ...@@ -944,6 +944,9 @@ class MDL_context
private: private:
MDL_context(const MDL_context &rhs); /* not implemented */ MDL_context(const MDL_context &rhs); /* not implemented */
MDL_context &operator=(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*);
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment