summaryrefslogtreecommitdiff
path: root/mysql-test/collections
diff options
context:
space:
mode:
authorOleksandr Byelkin <sanja@mariadb.com>2022-02-04 14:11:46 +0100
committerOleksandr Byelkin <sanja@mariadb.com>2022-02-04 14:11:46 +0100
commit9ed8deb656d9378fc9c1c7fb12c15674b6323ab0 (patch)
tree5bc8e7e4182b9e5da99d2a2ba40736f3ac450efe /mysql-test/collections
parent3351dfaab0599268eaf25f9d6995ef128910a8b9 (diff)
parentd87979b48c614dbba4afd1b235307ee354c27719 (diff)
downloadmariadb-git-9ed8deb656d9378fc9c1c7fb12c15674b6323ab0.tar.gz
Merge branch '10.6' into 10.7
Diffstat (limited to 'mysql-test/collections')
-rw-r--r--mysql-test/collections/buildbot_suites.bat3
1 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/collections/buildbot_suites.bat b/mysql-test/collections/buildbot_suites.bat
index 0ec8e4b9939..d4a6e665840 100644
--- a/mysql-test/collections/buildbot_suites.bat
+++ b/mysql-test/collections/buildbot_suites.bat
@@ -1,4 +1,5 @@
-perl mysql-test-run.pl --verbose-restart --force --suite-timeout=120 --max-test-fail=10 --retry=3 --parallel=4 --suite=^
+if "%MTR_PARALLEL%"=="" set MTR_PARALLEL=%NUMBER_OF_PROCESSORS%
+perl mysql-test-run.pl --verbose-restart --force --suite-timeout=120 --max-test-fail=10 --retry=3 --suite=^
vcol,gcol,perfschema,^
main,^
innodb,^