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.11' into 11.1

Browse Source
This commit is contained in:
Yuchen Pei
2024-05-31 10:54:31 +10:00
parent 94999c16cc 22774ddb53
commit 2d3e2c58b6
119 changed files with 1558 additions and 303 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -436,7 +436,7 @@ sub main {
{
$opt_parallel= $ENV{NUMBER_OF_PROCESSORS} || 1;
}
elsif (IS_MAC)
elsif (IS_MAC || IS_FREEBSD)
{
$opt_parallel= `sysctl -n hw.ncpu`;
}