diff options
author | Alexander Nozdrin <alik@sun.com> | 2010-01-31 01:20:01 +0300 |
---|---|---|
committer | Alexander Nozdrin <alik@sun.com> | 2010-01-31 01:20:01 +0300 |
commit | e3b834dbe7cd5950e0036ad4baf670334c9c7d8a (patch) | |
tree | 9563be75af0704043c82763a59f1f6852a6bb6c6 /mysql-test/collections | |
parent | 84c24b4974fb2b7ab99d483ed8ef65d851ef0264 (diff) | |
parent | cc4be8055d6f0608f0f6cb68dde57a0d8f2929b3 (diff) | |
download | mariadb-git-e3b834dbe7cd5950e0036ad4baf670334c9c7d8a.tar.gz |
Auto-merge from mysql-next-mr.
Diffstat (limited to 'mysql-test/collections')
-rw-r--r-- | mysql-test/collections/default.daily | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mysql-test/collections/default.daily b/mysql-test/collections/default.daily index 56714662b8f..52af68328c4 100644 --- a/mysql-test/collections/default.daily +++ b/mysql-test/collections/default.daily @@ -1 +1,4 @@ -perl mysql-test-run.pl --timer --force --comment=rpl_ndb_row --vardir=var-rpl_ndb_row --suite=rpl_ndb,ndb --mysqld=--binlog-format=row --experimental=collections/default.experimental +perl mysql-test-run.pl --timer --force --parallel=auto --experimental=collections/default.experimental --comment=n_mix --vardir=var-n_mix --mysqld=--binlog-format=mixed +perl mysql-test-run.pl --timer --force --parallel=auto --experimental=collections/default.experimental --comment=ps_row --vardir=var-ps_row --ps-protocol --mysqld=--binlog-format=row +perl mysql-test-run.pl --timer --force --parallel=auto --experimental=collections/default.experimental --comment=embedded --vardir=var-emebbed --embedded +perl mysql-test-run.pl --timer --force --parallel=auto --experimental=collections/default.experimental --comment=funcs_1 --vardir=var-funcs_1 --suite=funcs_1 |