summaryrefslogtreecommitdiff
path: root/plugin/metadata_lock_info
diff options
context:
space:
mode:
authorSergey Vojtovich <svoj@mariadb.org>2013-12-13 12:42:45 +0400
committerSergey Vojtovich <svoj@mariadb.org>2013-12-13 12:42:45 +0400
commit258bf32d3c8d7462d54c3acce724308faf270b94 (patch)
tree6b60a2f8b7e9a7f7af42aa3de59e225942f90866 /plugin/metadata_lock_info
parent3771e14ea9957dde8f25ccf9f99df7a2aa906fcb (diff)
downloadmariadb-git-258bf32d3c8d7462d54c3acce724308faf270b94.tar.gz
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
Diffstat (limited to 'plugin/metadata_lock_info')
-rw-r--r--plugin/metadata_lock_info/mysql-test/metadata_lock_info/suite.pm3
1 files changed, 2 insertions, 1 deletions
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 { };