Auto-merge from mysql-trunk.

9cc2d776 · Alexander Nozdrin · fa2d2c18 · d9a074e1 · 9cc2d776
Commit 9cc2d776 authored Mar 15, 2010 by Alexander Nozdrin
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

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

No files found.
--- a/mysql-test/collections/default.daily
+++ b/mysql-test/collections/default.daily
@@ -2,3 +2,4 @@ perl mysql-test-run.pl --timer --force --parallel=auto --experimental=collection
 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
+perl mysql-test-run.pl --timer --force --parallel=auto                                                 --comment=rpl_ndb_row    --vardir=var-rpl_ndb_row            --mysqld=--binlog-format=row  --suite=rpl_ndb,ndb