diff options
| -rw-r--r-- | debian/dist/Debian/mariadb-server-10.0.files.in | 1 | ||||
| -rw-r--r-- | debian/dist/Ubuntu/mariadb-server-10.0.files.in | 1 | ||||
| -rw-r--r-- | mysql-test/t/mysqld--help.test | 2 | ||||
| -rw-r--r-- | plugin/metadata_lock_info/mysql-test/metadata_lock_info/suite.pm | 3 |
4 files changed, 5 insertions, 2 deletions
diff --git a/debian/dist/Debian/mariadb-server-10.0.files.in b/debian/dist/Debian/mariadb-server-10.0.files.in index 8b98c7e9433..f5501734d49 100644 --- a/debian/dist/Debian/mariadb-server-10.0.files.in +++ b/debian/dist/Debian/mariadb-server-10.0.files.in @@ -4,6 +4,7 @@ usr/lib/mysql/plugin/ha_sequence.so usr/lib/mysql/plugin/ha_sphinx.so usr/lib/mysql/plugin/handlersocket.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_response_time.so usr/lib/mysql/plugin/semisync_master.so diff --git a/debian/dist/Ubuntu/mariadb-server-10.0.files.in b/debian/dist/Ubuntu/mariadb-server-10.0.files.in index 8e390e73db9..2bdd91bc564 100644 --- a/debian/dist/Ubuntu/mariadb-server-10.0.files.in +++ b/debian/dist/Ubuntu/mariadb-server-10.0.files.in @@ -4,6 +4,7 @@ usr/lib/mysql/plugin/ha_sequence.so usr/lib/mysql/plugin/ha_sphinx.so usr/lib/mysql/plugin/handlersocket.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_response_time.so usr/lib/mysql/plugin/semisync_master.so diff --git a/mysql-test/t/mysqld--help.test b/mysql-test/t/mysqld--help.test index 55dce60648b..1b119ca7ea6 100644 --- a/mysql-test/t/mysqld--help.test +++ b/mysql-test/t/mysqld--help.test @@ -28,7 +28,7 @@ perl; thread-concurrency super-large-pages mutex-deadlock-detector connect null-audit aria oqgraph sphinx thread-handling 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 # names: diff --git a/plugin/metadata_lock_info/mysql-test/metadata_lock_info/suite.pm b/plugin/metadata_lock_info/mysql-test/metadata_lock_info/suite.pm index 3dcf7c99999..0773110821d 100644 --- a/plugin/metadata_lock_info/mysql-test/metadata_lock_info/suite.pm +++ b/plugin/metadata_lock_info/mysql-test/metadata_lock_info/suite.pm @@ -2,7 +2,8 @@ package My::Suite::Metadata_lock_info; @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 { }; |