diff options
author | Jan Lindström <jplindst@mariadb.org> | 2014-01-25 11:02:49 +0200 |
---|---|---|
committer | Jan Lindström <jplindst@mariadb.org> | 2014-01-25 11:02:49 +0200 |
commit | d43afb8828e358f9c3bb690d0fdcd88b0637f155 (patch) | |
tree | f977f3b5fa3c938183510750aecbea31bccc67ef /sql/mdl.h | |
parent | d0f77b83611077344ff29db02ea5593c9da62537 (diff) | |
parent | 02765f4c614069ece1f30976848b6299ba6f24bd (diff) | |
download | mariadb-git-d43afb8828e358f9c3bb690d0fdcd88b0637f155.tar.gz |
Merge MariaDB-10.0.7 revision 3961.
Diffstat (limited to 'sql/mdl.h')
-rw-r--r-- | sql/mdl.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/mdl.h b/sql/mdl.h index 75132962f8f..b1e6bfa428a 100644 --- a/sql/mdl.h +++ b/sql/mdl.h @@ -960,6 +960,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*); }; @@ -1004,4 +1007,7 @@ static const ulong MDL_LOCKS_HASH_PARTITIONS_DEFAULT = 8; to avoid starving out weak, low-prio locks. */ extern "C" ulong max_write_lock_count; + +extern MYSQL_PLUGIN_IMPORT +int mdl_iterate(int (*callback)(MDL_ticket *ticket, void *arg), void *arg); #endif |