From f88e6af0bbbba5f7fdf90f6c3401a2c49093a4e9 Mon Sep 17 00:00:00 2001 From: Tor Didriksen Date: Mon, 14 Jun 2010 11:23:49 +0200 Subject: 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. --- mysql-test/t/blackhole_plugin.test | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'mysql-test/t/blackhole_plugin.test') 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; -- cgit v1.2.1