diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2021-12-07 22:11:30 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2021-12-07 22:11:30 +0100 |
| commit | 186c1fa25057a465f4725ef28ce3d878af20947b (patch) | |
| tree | f0f2f1c92572887f225ffd18f330ed97861619d6 /mysql-test/mariadb-test-run.pl | |
| parent | 6deaff58a9d5208f3c2a3e57fd17ecac17fe34ad (diff) | |
| parent | 62ea1b4407762164982221dc9796502a91c139cc (diff) | |
| download | mariadb-git-186c1fa25057a465f4725ef28ce3d878af20947b.tar.gz | |
Merge branch '10.5' into 10.6
Diffstat (limited to 'mysql-test/mariadb-test-run.pl')
| -rwxr-xr-x | mysql-test/mariadb-test-run.pl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/mariadb-test-run.pl b/mysql-test/mariadb-test-run.pl index 1a2c1cb1094..bf2d6e9be00 100755 --- a/mysql-test/mariadb-test-run.pl +++ b/mysql-test/mariadb-test-run.pl @@ -5084,7 +5084,7 @@ sub mysqld_start ($$) { $mysqld->{'started_opts'}= $extra_opts; my $expect_file= "$opt_vardir/tmp/".$mysqld->name().".expect"; - my $rc= $oldexe eq $exe || + my $rc= $oldexe eq ($exe || '') || sleep_until_file_created($mysqld->value('pid-file'), $expect_file, $opt_start_timeout, $mysqld->{'proc'}, $warn_seconds); if (!$rc) |