summaryrefslogtreecommitdiff
path: root/mysql-test/collections
diff options
context:
space:
mode:
authorOleksandr Byelkin <sanja@mariadb.com>2022-02-03 17:01:31 +0100
committerOleksandr Byelkin <sanja@mariadb.com>2022-02-03 17:01:31 +0100
commitf5c5f8e41ecd4d407022d3772ac43075c16824a5 (patch)
tree8a46fbd9dfd51352800ea606ae52a53ceb239501 /mysql-test/collections
parent8d742fe4acb91652fcbeb36506d20ead4ff19e83 (diff)
parentcf63eecef44f189ce2d221612dee9dfc1885ba4e (diff)
downloadmariadb-git-f5c5f8e41ecd4d407022d3772ac43075c16824a5.tar.gz
Merge branch '10.5' into 10.6
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,^