mirror of
https://github.com/MariaDB/server.git
synced 2026-05-16 20:07:13 +02:00
Merge branch '10.5' into 10.6
This commit is contained in:
commit
7b53672c63
360 changed files with 8991 additions and 2192 deletions
|
|
@ -434,6 +434,10 @@ sub main {
|
|||
{
|
||||
$opt_parallel= $ENV{NUMBER_OF_PROCESSORS} || 1;
|
||||
}
|
||||
elsif (IS_MAC)
|
||||
{
|
||||
$opt_parallel= `sysctl -n hw.ncpu`;
|
||||
}
|
||||
else
|
||||
{
|
||||
my $sys_info= My::SysInfo->new();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue