From ec0b030f263b11b3f1bd2d894e8dde38814ecf78 Mon Sep 17 00:00:00 2001 From: Bjorn Munch Date: Mon, 30 May 2011 15:55:44 +0200 Subject: Bug #12604711 MTR SHOULD READ PLUGIN.DEFS FILES FROM IMPORTED FEATURE TREES Added reading from plugin.defs files under plugins/* --- mysql-test/include/plugin.defs | 1 - mysql-test/mysql-test-run.pl | 5 +++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/mysql-test/include/plugin.defs b/mysql-test/include/plugin.defs index 2b840d9f438..e07c603c8e5 100644 --- a/mysql-test/include/plugin.defs +++ b/mysql-test/include/plugin.defs @@ -39,4 +39,3 @@ ha_archive storage/archive ARCHIVE_PLUGIN ha_blackhole storage/blackhole BLACKHOLE_PLUGIN ha_federated storage/federated FEDERATED_PLUGIN mypluglib plugin/fulltext SIMPLE_PARSER -thread_pool plugin/thread_pool THREADPOOL_PLUGIN thread_pool,TP_THREAD_STATE,TP_THREAD_GROUP_STATE,TP_THREAD_GROUP_STATS diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 42360aeb28f..f2487130015 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -448,6 +448,11 @@ sub main { # read_plugin_defs("include/plugin.defs"); + # Also read from any plugin local plugin.defs + for (glob "$basedir/plugin/*/tests/mtr/plugin.defs") { + read_plugin_defs($_); + } + # Simplify reference to semisync plugins $ENV{'SEMISYNC_PLUGIN_OPT'}= $ENV{'SEMISYNC_MASTER_PLUGIN_OPT'}; -- cgit v1.2.1