1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-4748 - metadata_lock_info plugin

Browse Source 
- 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
This commit is contained in:
Sergey Vojtovich 2013-12-13 12:42:45 +04:00
parent 3771e14ea9
commit 258bf32d3c
4 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/dist/Debian/mariadb-server-10.0.files.in vendored
View File

@ -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

1
debian/dist/Ubuntu/mariadb-server-10.0.files.in vendored
View File

@ -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

2
mysql-test/t/mysqld--help.test
View File

@ -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:

3
plugin/metadata_lock_info/mysql-test/metadata_lock_info/suite.pm
View File

@ -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 { };