summaryrefslogtreecommitdiff
path: root/mysql-test/collections
diff options
context:
space:
mode:
authorBjorn Munch <Bjorn.Munch@sun.com>2009-06-03 12:46:04 +0200
committerBjorn Munch <Bjorn.Munch@sun.com>2009-06-03 12:46:04 +0200
commit912f9718492061c4e07fc5173f87e26c0457fa36 (patch)
treeef05a919b7c76898c7f366c15403137670080df2 /mysql-test/collections
parent5ce3d7a202b3eb16a12b6a98939b7b33a3cb984d (diff)
downloadmariadb-git-912f9718492061c4e07fc5173f87e26c0457fa36.tar.gz
Bug #45256 Enable 'auto' for mtr --parallel
Let the user specify 'auto' for parallel value Also set --parallel=auto in default.push so we can get this tested.
Diffstat (limited to 'mysql-test/collections')
-rw-r--r--mysql-test/collections/default.push10
1 files changed, 5 insertions, 5 deletions
diff --git a/mysql-test/collections/default.push b/mysql-test/collections/default.push
index 8a0ec4416c5..0f7c8d9949e 100644
--- a/mysql-test/collections/default.push
+++ b/mysql-test/collections/default.push
@@ -1,5 +1,5 @@
-perl mysql-test-run.pl --timer --force --parallel=2 --comment=n_mix --mysqld=--binlog-format=mixed --experimental=collections/default.experimental
-perl mysql-test-run.pl --timer --force --parallel=2 --comment=ps_row --ps-protocol --mysqld=--binlog-format=row --experimental=collections/default.experimental
-perl mysql-test-run.pl --timer --force --parallel=2 --comment=embedded --embedded --experimental=collections/default.experimental
-perl mysql-test-run.pl --timer --force --parallel=2 --comment=rpl_binlog_row --suite=rpl,binlog --mysqld=--binlog-format=row --experimental=collections/default.experimental
-perl mysql-test-run.pl --timer --force --parallel=2 --comment=funcs_1 --suite=funcs_1 --experimental=collections/default.experimental
+perl mysql-test-run.pl --timer --force --parallel=auto --comment=n_mix --mysqld=--binlog-format=mixed --experimental=collections/default.experimental
+perl mysql-test-run.pl --timer --force --parallel=auto --comment=ps_row --ps-protocol --mysqld=--binlog-format=row --experimental=collections/default.experimental
+perl mysql-test-run.pl --timer --force --parallel=auto --comment=embedded --embedded --experimental=collections/default.experimental
+perl mysql-test-run.pl --timer --force --parallel=auto --comment=rpl_binlog_row --suite=rpl,binlog --mysqld=--binlog-format=row --experimental=collections/default.experimental
+perl mysql-test-run.pl --timer --force --parallel=auto --comment=funcs_1 --suite=funcs_1 --experimental=collections/default.experimental