database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge branch '10.5' into 10.6

Browse Source
This commit is contained in:
Sergei Golubchik
2021-12-07 22:11:30 +01:00
parent 6deaff58a9 62ea1b4407
commit 186c1fa250
18 changed files with 391 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/mariadb-test-run.pl
View File

@@ -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)