fix incorrect merge

e40ed0e8 · Sergei Golubchik · 06219c2a · e40ed0e8
Commit e40ed0e8 authored Apr 12, 2020 by Sergei Golubchik
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 5 deletions

mysql-test/mysql-test-run.pl mysql-test/mysql-test-run.pl +1 -5

No files found.
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -614,11 +614,7 @@ sub main {
    else
    {
      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;
    $opt_parallel= $max_par if ($opt_parallel > $max_par);