WIP merge 10.3 into 10.410.4-MDEV-29988-merge

1 files changed, 10 insertions, 3 deletions

diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index f7a581b728d..4d1b3cd6aa5 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -1795,7 +1795,7 @@ sub collect_mysqld_features_from_running_server ()
 
 sub find_mysqld {
 
-  my ($mysqld_basedir)= $ENV{MTR_BINDIR}|| @_;
+  my ($mysqld_basedir)= $ENV{MTR_BINDIR_FORCED} || $ENV{MTR_BINDIR} || @_;
 
   my @mysqld_names= ("mysqld", "mysqld-max-nt", "mysqld-max",
 		     "mysqld-nt");
@@ -1806,7 +1806,7 @@ sub find_mysqld {
     unshift(@mysqld_names, "mysqld-debug");
   }
 
-  return my_find_bin($bindir,
+  return my_find_bin($mysqld_basedir,
 		     ["sql", "libexec", "sbin", "bin"],
 		     [@mysqld_names]);
 }
@@ -4659,6 +4659,7 @@ sub check_expected_crash_and_restart {
         mtr_verbose("Test says wait before restart") if $waits == 0;
         next;
       }
+      delete $ENV{MTR_BINDIR_FORCED};
 
       # Ignore any partial or unknown command
       next unless $last_line =~ /^restart/;
@@ -4666,7 +4667,13 @@ sub check_expected_crash_and_restart {
       # extra command line options to add to the restarted mysqld.
       # Anything other than 'wait' or 'restart:' (with a colon) will
       # result in a restart with original mysqld options.
-      if ($last_line =~ /restart:(.+)/) {
+      if ($last_line =~ /restart_bindir\s+(\S+)(:.+)?/) {
+        $ENV{MTR_BINDIR_FORCED}= $1;
+        if ($2) {
+          my @rest_opt= split(' ', $2);
+          $mysqld->{'restart_opts'}= \@rest_opt;
+        }
+      } elsif ($last_line =~ /restart:(.+)/) {
         my @rest_opt= split(' ', $1);
         $mysqld->{'restart_opts'}= \@rest_opt;
       } else {