From: Bjorn Munch
Date: May 25 2011 2:40pm
Subject: bzr commit into mysql-5.5-mtr branch (bjorn.munch:3221)
List-Archive: http://lists.mysql.com/commits/138097
Message-Id: <201105251440.p4PEexxr003515@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1397954023=="

--===============1397954023==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///home/bm136801/my/chtime-55/ based on revid:bjorn.munch@stripped

 3221 Bjorn Munch	2011-05-25
      Increase test timeout for rpl.rpl_typeconv
      Not for test itself but because it procuces large number of warnings,
        and this may take >90s to filter on slow boxes

    added:
      mysql-test/suite/rpl/t/rpl_typeconv-master.opt
=== added file 'mysql-test/suite/rpl/t/rpl_typeconv-master.opt'
--- a/mysql-test/suite/rpl/t/rpl_typeconv-master.opt	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/rpl/t/rpl_typeconv-master.opt	2011-05-25 14:39:39 +0000
@@ -0,0 +1 @@
+--testcase-timeout=40


--===============1397954023==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/bjorn.munch@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: bjorn.munch@stripped
# target_branch: file:///home/bm136801/my/chtime-55/
# testament_sha1: 7e530f48d5195097b559fad0645254fa92738176
# timestamp: 2011-05-25 16:40:59 +0200
# base_revision_id: bjorn.munch@stripped\
#   y6p4skmakb96g3k7
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWTbL/IQAAWHfgAAQUGf/91Ij
AAC////wUANt66ibgl7d62EokA1NqDaBGmmUzSYEaA0DKahlHhMTKnpPQQyDamgNNAEoIJPU2lT2
I1PJCPUNqepg0AAyU1Myamho0DI0G0TQDRoMElBA1GEzVMym0J6mJkAMhpNWd/A576HQpM6r7gE+
a2Vq2tkKzUZHjsn1VHKrNXfrLbL+eEdIHl884wyMH6kaCjWzaMCcp03Xw6MKR4jKJf/aZ5HRRGC0
YgRrxuv0+M+xTRg8RARculzoSSYyF7NQJome3ogiDzTAqRdIo87nNPUSONRF6eU0QxK/p9aEOtu5
24aotoeZ9UAHRqcSzlk14kHMsydgvFeA6A/wO/b0y0RBtFchtRDKeONwbjQpZjF4Sg07M8BGAUeL
sxjwBqWP8ryVwQARmzdqehWsBVBFLBrHHYY0VQbdJIhMkbJ7jbrG29LFbKzQK6kobrEfjQQSDjhe
DQs7jg0vl2ah2hdayulI3jdAZFwlV0nBNLVVVosY+HiI7CVMmLO/U4kijoVSf41lL8JOZu4UqRjm
saMQZFksCYSmvVyOO7ju1uxDs8bOzkIUsRVXz63WULYUYHpO1y0ocFJvjbrHXm7mIzZ2haqcq2v0
VkIIs9Z+E4irjrpLxi4JmH55bU2FwrPEXpAzaYDs+Vr/NAuwEunexRDmIQSBF6sZPgaMOhv4uWVI
0kZCnQ1up5at52low4URLgsCIVFNsbBkNBsuMWyG1pK0IMuONAZbTdfuetEZ5MM2mpW9WFkR7oqV
mp4brWSU/2m+aNFVoKjNd9XXSd3lhaRwF4453cy5QyNWSBzp4oehLYgmwSih0TOnDaCbl2TJNpaD
UWcghP1uqfWFnlvCEWbrcBT7uIvbiIw0vTe8MAmFOt3DEHJ7QcivbQIZKsU2Alb44+WbJAvEVUsM
bE0NmcpcprbDCdhDe2RsgQEIWthQEfnoAH0C1yEKQsfCigc6IVgsC9RIycObgeSzn6IoBq6pGty7
U1F+VWrXqXcSfccGMUz2C3aJs3znHyK8C8uiOOiqjCJdnCKFnCg9n8toCbYY3IxNfP6U3TwUUHXn
V9boxFsxvVHeHAJyKxmqk99RLU1hqXm9xhsuXLnqnN7yVyjWcHTZEfFhtjUr1+D5tA2AUhLnamVh
HY6XhL2yEPZXlYSovBg2qpuYMws26FCZqA5PkGDWRcG/4u5IpwoSBtl/kIA=


--===============1397954023==--