diff options
| author | Bjorn Munch <bjorn.munch@oracle.com> | 2011-05-30 15:55:44 +0200 |
|---|---|---|
| committer | Bjorn Munch <bjorn.munch@oracle.com> | 2011-05-30 15:55:44 +0200 |
| commit | ec0b030f263b11b3f1bd2d894e8dde38814ecf78 (patch) | |
| tree | 8b46506c8a62cbb917074ceb02087982166734ba /mysql-test | |
| parent | 9f6ec599802bdb36b97780f1a7cf8c6e1293c453 (diff) | |
| download | mariadb-git-ec0b030f263b11b3f1bd2d894e8dde38814ecf78.tar.gz | |
Bug #12604711 MTR SHOULD READ PLUGIN.DEFS FILES FROM IMPORTED FEATURE TREES
Added reading from plugin.defs files under plugins/*
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/include/plugin.defs | 1 | ||||
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 5 |
2 files changed, 5 insertions, 1 deletions
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'}; |