Upmerge optional testsuite path

mysql-test/lib/My/Find.pm

@@ -126,9 +126,9 @@ sub my_find_file {
 #
 #
 sub my_find_dir {
-  my ($base, $paths, $dirs, $required)= @_;
-  croak "usage: my_find_dir(<base>, <paths>[, <dirs>])"
-    unless (@_ == 3 or @_ == 2);
+  my ($base, $paths, $dirs, $optional)= @_;
+  croak "usage: my_find_dir(<base>, <paths>[, <dirs>[, <optional>]])"
+    unless (@_ == 3 or @_ == 2 or @_ == 4);
 
   # -------------------------------------------------------
   # Find and return the first directory
@@ -136,6 +136,7 @@ sub my_find_dir {
   foreach my $path (my_find_paths($base, $paths, $dirs)) {
     return $path if ( -d $path );
   }
+  return "" if $optional;
   find_error($base, $paths, $dirs);
 }
 

mysql-test/lib/mtr_cases.pm

@@ -137,6 +137,7 @@ sub collect_test_cases ($$$$) {
     {
       push(@$cases, collect_one_suite($suite, $opt_cases, $opt_skip_test_list));
       last if $some_test_found;
+      push(@$cases, collect_one_suite("i_".$suite, $opt_cases, $opt_skip_test_list));
     }
   }
 
@@ -288,13 +289,15 @@ sub collect_one_suite($)
       $suitedir= my_find_dir($::basedir,
 			     ["share/mysql-test/suite",
 			      "mysql-test/suite",
+			      "internal/mysql-test/suite",
 			      "mysql-test",
 			      # Look in storage engine specific suite dirs
 			      "storage/*/mtr",
 			      # Look in plugin specific suite dir
 			      "plugin/$suite/tests",
 			     ],
-			     [$suite, "mtr"]);
+			     [$suite, "mtr"], ($suite =~ /^i_/));
+      return unless $suitedir;
     }
     mtr_verbose("suitedir: $suitedir");
   }