summaryrefslogtreecommitdiff
path: root/mysql-test/t/blackhole_plugin.test
diff options
context:
space:
mode:
authorTor Didriksen <tor.didriksen@sun.com>2010-06-14 11:23:49 +0200
committerTor Didriksen <tor.didriksen@sun.com>2010-06-14 11:23:49 +0200
commitf88e6af0bbbba5f7fdf90f6c3401a2c49093a4e9 (patch)
tree47baecc56be788349386eb169f6f596ad14a9b07 /mysql-test/t/blackhole_plugin.test
parent14182ec9176f2b368270cd82a4a3b31b218f9252 (diff)
downloadmariadb-git-f88e6af0bbbba5f7fdf90f6c3401a2c49093a4e9.tar.gz
Bug #53261 MTR tests archive_plugin and blackhole_plugin fail when compiling with cmake
Let mtr lookup the plugins, rather than hard-coding autotools lib path. mysql-test/include/not_parallel.inc: Add new feature for skipping when running in parallel. mysql-test/mysql-test-run.pl: Use find_plugin to locate plugins. Export opt_parallel in environment. mysql-test/suite/federated/federated_plugin-master.opt: Use plugin dir from mtr. mysql-test/suite/federated/federated_plugin.test: Skip test, disabled. mysql-test/t/archive_plugin-master.opt: Use plugin dir from mtr. mysql-test/t/archive_plugin.test: Skip test if running in parallel. mysql-test/t/blackhole_plugin-master.opt: Use plugin dir from mtr. mysql-test/t/blackhole_plugin.test: Skip test if running in parallel.
Diffstat (limited to 'mysql-test/t/blackhole_plugin.test')
-rw-r--r--mysql-test/t/blackhole_plugin.test4
1 files changed, 4 insertions, 0 deletions
diff --git a/mysql-test/t/blackhole_plugin.test b/mysql-test/t/blackhole_plugin.test
index 5c712233dc7..1de5b2d0499 100644
--- a/mysql-test/t/blackhole_plugin.test
+++ b/mysql-test/t/blackhole_plugin.test
@@ -1,6 +1,10 @@
--source include/not_windows.inc
--source include/have_blackhole_plugin.inc
+# When running in parallel we get
+# Warning 1620 Plugin is busy and will be uninstalled on shutdown
+--source include/not_parallel.inc
+
CREATE TABLE t1(a int) ENGINE=BLACKHOLE;
DROP TABLE t1;