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

Merge 10.4 into 10.5

The functional changes of commit 5836191c8f
(MDEV-21168) are omitted due to MDEV-742 having addressed the issue.
This commit is contained in:
Marko Mäkelä
2020-04-25 21:57:52 +03:00
202 changed files with 2911 additions and 1669 deletions

View File

@@ -0,0 +1,18 @@
perl;
use strict;
use Time::HiRes qw(sleep);
my $search_count= $ENV{'SEARCH_COUNT'} or die "SEARCH_COUNT not set";
my $search_file= $ENV{'SEARCH_FILE'} or die "SEARCH_FILE not set";
my $wait_counter= 100; # 10 seconds
while (1)
{
my $cnt= 0;
open(FILE, $search_file) or die("Unable to open '$search_file': $!\n");
$cnt++ while (<FILE>);
close(FILE);
last if ($cnt == $search_count);
$wait_counter-- or
die "Timeout waiting for $search_count lines in $search_file\n";
sleep(0.1);
}
EOF