diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2021-11-26 17:15:41 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2021-11-26 17:15:41 +0100 |
| commit | f5441ef4dac9f3fd5dfe1bfa25a514715fee649f (patch) | |
| tree | b9cb5e57c244114abfb12b95a31333818a7955eb | |
| parent | a96b42826964b1dbb1eeee536c9f611e462719c0 (diff) | |
| download | mariadb-git-f5441ef4dac9f3fd5dfe1bfa25a514715fee649f.tar.gz | |
MDEV-26972 MTR worker aborts after server restart failure
restore the old behavior where without a debugger mtr does not
wait for mysqld to start. It was broken in feacc0aaf2
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index b87263eebd4..809f8794e00 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -5072,6 +5072,7 @@ sub mysqld_start ($$) { # Differs from "generic" MYSQLD_CMD by including all command line # options from *.opt and *.combination files. $ENV{'MYSQLD_LAST_CMD'}= "$exe @$args"; + my $oldexe= $exe; My::Debugger::setup_args(\$args, \$exe, $mysqld->name()); $ENV{'VALGRIND_TEST'}= $opt_valgrind = int(($exe || '') eq 'valgrind'); @@ -5127,8 +5128,9 @@ sub mysqld_start ($$) { $mysqld->{'started_opts'}= $extra_opts; my $expect_file= "$opt_vardir/tmp/".$mysqld->name().".expect"; - return sleep_until_file_created($mysqld->value('pid-file'), $expect_file, - $opt_start_timeout, $mysqld->{'proc'}, $warn_seconds); + return $oldexe eq $exe || + sleep_until_file_created($mysqld->value('pid-file'), $expect_file, + $opt_start_timeout, $mysqld->{'proc'}, $warn_seconds); } |