summaryrefslogtreecommitdiff
path: root/mysql-test/collections
diff options
context:
space:
mode:
authorAlexander Nozdrin <alik@sun.com>2010-01-31 01:20:01 +0300
committerAlexander Nozdrin <alik@sun.com>2010-01-31 01:20:01 +0300
commitf3d341fc3a636c03026f375b77820fe5dcb17836 (patch)
tree9563be75af0704043c82763a59f1f6852a6bb6c6 /mysql-test/collections
parentd11db72503d0c1d1abb9c9dfa8b2c267da178e9f (diff)
parent8d4a8427298fdbf4be74712036fb8b2d172a1824 (diff)
downloadmariadb-git-f3d341fc3a636c03026f375b77820fe5dcb17836.tar.gz
Auto-merge from mysql-next-mr.
Diffstat (limited to 'mysql-test/collections')
-rw-r--r--mysql-test/collections/default.daily5
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