Auto-merge from mysql-next-mr.

f3d341fc · Alexander Nozdrin · d11db725 · 8d4a8427 · f3d341fc
Commit f3d341fc authored Jan 31, 2010 by Alexander Nozdrin
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

mysql-test/collections/default.daily mysql-test/collections/default.daily +4 -1

No files found.
--- a/mysql-test/collections/default.daily
+++ b/mysql-test/collections/default.daily
-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