List:Commits« Previous MessageNext Message »
From:Anitha Gopi Date:February 5 2011 2:21am
Subject:bzr push into mysql-trunk branch (anitha.gopi:3597 to 3598)
View as plain text  
 3598 Anitha Gopi	2011-02-05
      Added some more combinations

    modified:
      mysql-test/collections/mysql-trunk.daily
 3597 Serge Kozlov	2011-02-04 [merge]
      merge mysql-5.5 to mysql-trunk

    modified:
      mysql-test/suite/rpl/r/rpl_heartbeat_2slaves.result
      mysql-test/suite/rpl/t/rpl_heartbeat_2slaves.test
=== modified file 'mysql-test/collections/mysql-trunk.daily'
--- a/mysql-test/collections/mysql-trunk.daily	2011-01-27 00:57:39 +0000
+++ b/mysql-test/collections/mysql-trunk.daily	2011-02-05 02:17:54 +0000
@@ -1,9 +1,10 @@
 
 perl mysql-test-run.pl --force --timer --parallel=auto --experimental=collections/default.experimental --comment=normal               --vardir=var-normal                                                                  --report-features
 perl mysql-test-run.pl --force --timer --parallel=auto --experimental=collections/default.experimental --comment=n_mix                --vardir=var-n_mix                                  --mysqld=--binlog-format=mixed
-perl mysql-test-run.pl --force --timer --parallel=auto --experimental=collections/default.experimental --comment=rpl_binlog_row       --vardir=var-rpl_binlog_row      --suite=rpl,binlog --mysqld=--binlog-format=row     --skip-ndb
+perl mysql-test-run.pl --force --timer --parallel=auto --experimental=collections/default.experimental --comment=row                --vardir=var-row                                  --mysqld=--binlog-format=row
 perl mysql-test-run.pl --force --timer --parallel=auto --experimental=collections/default.experimental --comment=ps_row               --vardir=var-ps_row                                 --mysqld=--binlog-format=row     --ps-protocol
 perl mysql-test-run.pl --force --timer --parallel=auto --experimental=collections/default.experimental --comment=embedded             --vardir=var-embedded                                                                --embedded
+perl mysql-test-run.pl --force --timer --parallel=auto --experimental=collections/default.experimental --comment=ps                   --vardir=var-ps                                                                --ps-protocol
 perl mysql-test-run.pl --force --timer --parallel=auto --experimental=collections/default.experimental --comment=funcs_1              --vardir=var-funcs_1             --suite=funcs_1
 perl mysql-test-run.pl --force --timer --parallel=auto --experimental=collections/default.experimental --comment=ps_funcs1            --vardir=var-ps_funcs_1          --suite=funcs_1                                     --ps-protocol
 perl mysql-test-run.pl --force --timer --parallel=auto --experimental=collections/default.experimental --comment=funcs2               --vardir=var-funcs2              --suite=funcs_2


Attachment: [text/bzr-bundle] bzr/anitha.gopi@sun.com-20110205021754-ebrnbqg9khw2zg04.bundle
Thread
bzr push into mysql-trunk branch (anitha.gopi:3597 to 3598)Anitha Gopi5 Feb