From 9636b7cf5500da561729af8b60dcae6560b1df74 Mon Sep 17 00:00:00 2001
From: Alexander Barkov <bar@mariadb.com>
Date: Mon, 12 Apr 2021 20:42:41 +0400
Subject: [PATCH] MDEV-25393 Fix mysql-test/lib/mtr_cases.pm to search tests in
 submodules

---
 mysql-test/lib/mtr_cases.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mysql-test/lib/mtr_cases.pm b/mysql-test/lib/mtr_cases.pm
index b61333535dc..dd003dea31d 100644
--- a/mysql-test/lib/mtr_cases.pm
+++ b/mysql-test/lib/mtr_cases.pm
@@ -64,8 +64,8 @@ my $plugin_suitedir_regex;
 my $overlay_regex;
 
 if (-d '../sql') {
-  @plugin_suitedirs= ('storage/*/mysql-test', 'plugin/*/mysql-test');
-  $overlay_regex= '\b(?:storage|plugin)/(\w+)/mysql-test\b';
+  @plugin_suitedirs= ('storage/*/mysql-test', 'plugin/*/mysql-test', 'storage/*/*/mysql-test', );
+  $overlay_regex= '\b(?:storage|plugin|storage[/][^/]*)/(\w+)/mysql-test\b';
 } else {
   @plugin_suitedirs= ('mysql-test/plugin/*');
   $overlay_regex= '\bmysql-test/plugin/(\w+)\b';