merge into release clone

2e14cd05 · Daniel Fischer · cf5e5f83 · 27728ab9 · 2e14cd05
Commit 2e14cd05 authored Aug 19, 2011 by Daniel Fischer
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

mysql-test/mysql-test-run.pl mysql-test/mysql-test-run.pl +3 -2

No files found.
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -450,8 +450,9 @@ sub main {
  #
  read_plugin_defs("include/plugin.defs");

-  # Also read from any plugin local plugin.defs
-  for (glob "$basedir/plugin/*/tests/mtr/plugin.defs") {
+  # Also read from any plugin local or suite specific plugin.defs
+  for (glob "$basedir/plugin/*/tests/mtr/plugin.defs".
+            " suite/*/plugin.defs") {
    read_plugin_defs($_);
  }