diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-11-29 11:39:34 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-11-29 11:39:34 +0200 |
| commit | 51c89849d16f3f6cfadfa645c49815db3cbfece7 (patch) | |
| tree | 8679103f7897480cc9b5ff3308687cce1f32dade /mysql-test/mariadb-test-run.pl | |
| parent | bf8735eb16068c0d2480948b365f7e39dc011be5 (diff) | |
| parent | d4cb1776030b643895da0532b75c051f55e84356 (diff) | |
| download | mariadb-git-51c89849d16f3f6cfadfa645c49815db3cbfece7.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'mysql-test/mariadb-test-run.pl')
| -rwxr-xr-x | mysql-test/mariadb-test-run.pl | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mysql-test/mariadb-test-run.pl b/mysql-test/mariadb-test-run.pl index 439b51d30ff..1a2c1cb1094 100755 --- a/mysql-test/mariadb-test-run.pl +++ b/mysql-test/mariadb-test-run.pl @@ -5028,6 +5028,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'); @@ -5083,7 +5084,8 @@ sub mysqld_start ($$) { $mysqld->{'started_opts'}= $extra_opts; my $expect_file= "$opt_vardir/tmp/".$mysqld->name().".expect"; - my $rc= sleep_until_file_created($mysqld->value('pid-file'), $expect_file, + my $rc= $oldexe eq $exe || + sleep_until_file_created($mysqld->value('pid-file'), $expect_file, $opt_start_timeout, $mysqld->{'proc'}, $warn_seconds); if (!$rc) { |