summaryrefslogtreecommitdiff
path: root/mysql-test/suite.pm
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2012-04-17 20:28:21 +0200
committerSergei Golubchik <sergii@pisem.net>2012-04-17 20:28:21 +0200
commit1c879717eca205a4cad421882c4ed14bbd549a99 (patch)
tree285135ad73012fb7d92438ec5422a62d781caed0 /mysql-test/suite.pm
parent580eca69ae0fd5186231ef318964349ffff6c499 (diff)
downloadmariadb-git-1c879717eca205a4cad421882c4ed14bbd549a99.tar.gz
bugfix: mysqld failed to start if a compiled-in plugin failed to initialize
(--xxx=ON behaving as --xxx=FORCE)
Diffstat (limited to 'mysql-test/suite.pm')
-rw-r--r--mysql-test/suite.pm3
1 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/suite.pm b/mysql-test/suite.pm
index 7c234afffb1..1c2f55660c2 100644
--- a/mysql-test/suite.pm
+++ b/mysql-test/suite.pm
@@ -26,6 +26,9 @@ sub skip_combinations {
$skip{'include/not_windows.inc'} = 'Requires not Windows' if IS_WINDOWS;
+ $skip{'t/plugin_loaderr.test'} = 'needs compiled-in innodb'
+ unless $::mysqld_variables{'innodb'} eq "ON";
+
# disable tests that use ipv6, if unsupported
use Socket;
$skip{'include/check_ipv6.inc'} = 'No IPv6'