Commit 258bf32d authored by Sergey Vojtovich's avatar Sergey Vojtovich

MDEV-4748 - metadata_lock_info plugin

- include metadata_lock_info plugin into debian packages
- ignore metadata_lock_info plugin in mysqld--help test
- let test suite run with built-in metadata_lock_info plugin
parent 3771e14e
...@@ -4,6 +4,7 @@ usr/lib/mysql/plugin/ha_sequence.so ...@@ -4,6 +4,7 @@ usr/lib/mysql/plugin/ha_sequence.so
usr/lib/mysql/plugin/ha_sphinx.so usr/lib/mysql/plugin/ha_sphinx.so
usr/lib/mysql/plugin/handlersocket.so usr/lib/mysql/plugin/handlersocket.so
usr/lib/mysql/plugin/locales.so usr/lib/mysql/plugin/locales.so
usr/lib/mysql/plugin/metadata_lock_info.so
usr/lib/mysql/plugin/query_cache_info.so usr/lib/mysql/plugin/query_cache_info.so
usr/lib/mysql/plugin/query_response_time.so usr/lib/mysql/plugin/query_response_time.so
usr/lib/mysql/plugin/semisync_master.so usr/lib/mysql/plugin/semisync_master.so
......
...@@ -4,6 +4,7 @@ usr/lib/mysql/plugin/ha_sequence.so ...@@ -4,6 +4,7 @@ usr/lib/mysql/plugin/ha_sequence.so
usr/lib/mysql/plugin/ha_sphinx.so usr/lib/mysql/plugin/ha_sphinx.so
usr/lib/mysql/plugin/handlersocket.so usr/lib/mysql/plugin/handlersocket.so
usr/lib/mysql/plugin/locales.so usr/lib/mysql/plugin/locales.so
usr/lib/mysql/plugin/metadata_lock_info.so
usr/lib/mysql/plugin/query_cache_info.so usr/lib/mysql/plugin/query_cache_info.so
usr/lib/mysql/plugin/query_response_time.so usr/lib/mysql/plugin/query_response_time.so
usr/lib/mysql/plugin/semisync_master.so usr/lib/mysql/plugin/semisync_master.so
......
...@@ -28,7 +28,7 @@ perl; ...@@ -28,7 +28,7 @@ perl;
thread-concurrency super-large-pages mutex-deadlock-detector thread-concurrency super-large-pages mutex-deadlock-detector
connect null-audit aria oqgraph sphinx thread-handling connect null-audit aria oqgraph sphinx thread-handling
test-sql-discovery rpl-semi-sync query-cache-info test-sql-discovery rpl-semi-sync query-cache-info
query-response-time locales/; query-response-time metadata-lock-info locales/;
# And substitute the content some environment variables with their # And substitute the content some environment variables with their
# names: # names:
......
...@@ -2,7 +2,8 @@ package My::Suite::Metadata_lock_info; ...@@ -2,7 +2,8 @@ package My::Suite::Metadata_lock_info;
@ISA = qw(My::Suite); @ISA = qw(My::Suite);
return "No Metadata_lock_info plugin" unless $ENV{METADATA_LOCK_INFO_SO}; return "No Metadata_lock_info plugin" unless $ENV{METADATA_LOCK_INFO_SO} or
$::mysqld_variables{'metadata-lock-info'} eq "ON";;
bless { }; bless { };
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