From: sayantan.dutta
Date: February 15 2012 2:24pm
Subject: bzr push into mysql-trunk branch (sayantan.dutta:3901 to 3902)
List-Archive: http://lists.mysql.com/commits/142892
Message-Id: <201202151424.q1FEOIkt010158@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3902 sayantan.dutta@stripped	2012-02-15
      (no message)

    modified:
      mysql-test/collections/default.push
 3901 sayantan.dutta@stripped	2012-02-15
      BUG #13625278 - PB2 SHOULD PROVIDE MORE USEFUL INFORMATION FOR TIMEOUTS

    modified:
      mysql-test/collections/default.push
      mysql-test/mysql-test-run.pl
      mysql-test/t/1st.test
=== modified file 'mysql-test/collections/default.push'
--- a/mysql-test/collections/default.push	2012-02-15 14:11:20 +0000
+++ b/mysql-test/collections/default.push	2012-02-15 14:20:39 +0000
@@ -1,5 +1,5 @@
 #perl mysql-test-run.pl --timer --force --parallel=auto --comment=n_mix --vardir=var-n_mix --mysqld=--binlog-format=mixed --experimental=collections/default.experimental --skip-ndb --skip-test-list=collections/disabled-per-push.list --unit-tests
-perl mysql-test-run.pl --parallel=4 1st 1st 1st 1st
+perl mysql-test-run.pl --parallel=4 1st 1st 1st 1st --testcase-timeout=60
 perl mysql-test-run.pl --timer --force --parallel=auto --comment=main_ps_row --vardir=var-main-ps_row --suite=main --ps-protocol --mysqld=--binlog-format=row --experimental=collections/default.experimental --skip-ndb --skip-test-list=collections/disabled-per-push.list
 perl mysql-test-run.pl --timer --force --parallel=auto --comment=main_embedded --vardir=var-main_emebbed  --suite=main --embedded --experimental=collections/default.experimental --skip-ndb
 perl mysql-test-run.pl --timer --force --parallel=auto --comment=innodb_4k_size --vardir=var-innodb-4k --experimental=collections/default.experimental --skip-ndb --suite=innodb --mysqld=--innodb-page-size=4k

No bundle (reason: useless for push emails).