database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

fix incorrect merge

Browse Source
This commit is contained in:
Sergei Golubchik
2020-04-12 18:07:40 +02:00
parent 06219c2ad4
commit e40ed0e881
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mysql-test/mysql-test-run.pl
View File

@ -614,11 +614,7 @@ sub main {
else else
{ {
my $sys_info= My::SysInfo->new(); my $sys_info= My::SysInfo->new();
$opt_parallel= $sys_info->num_cpus() + $opt_parallel= $sys_info->num_cpus()+int($sys_info->min_bogomips()/500)-4;
int($sys_info->min_bogomips()/500) - 4;
for my $limit (2000, 1500, 1000, 500){
$opt_parallel-- if ($sys_info->min_bogomips() < $limit);
}
} }
my $max_par= $ENV{MTR_MAX_PARALLEL} || 8; my $max_par= $ENV{MTR_MAX_PARALLEL} || 8;
$opt_parallel= $max_par if ($opt_parallel > $max_par); $opt_parallel= $max_par if ($opt_parallel > $max_par);