From: Anitha Gopi
Date: May 25 2011 5:31am
Subject: bzr push into mysql-trunk branch (anitha.gopi:3108 to 3109)
List-Archive: http://lists.mysql.com/commits/138036
Message-Id: <201105250531.p4P5VWa2024225@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1715645065=="

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

 3109 Anitha Gopi	2011-05-25
      Changed to Oracle bug number

    modified:
      mysql-test/collections/default.experimental
 3108 Anitha Gopi	2011-05-25
      Restoring a line that was accidentally removed by revision 3100

    modified:
      mysql-test/collections/default.experimental
=== modified file 'mysql-test/collections/default.experimental'
--- a/mysql-test/collections/default.experimental	2011-05-25 04:23:44 +0000
+++ b/mysql-test/collections/default.experimental	2011-05-25 05:30:40 +0000
@@ -20,7 +20,7 @@ main.wait_timeout @solaris              
 
 rpl.rpl_checksum                         # BUG#12370830 2011-04-18 sven rpl_checksum failed on pb2 (server crash)
 rpl.rpl_cross_version                    # BUG#12416611 2011-05-02 sven fails sporadically on pb2, valgrind errors
-rpl.rpl_delayed_slave                    # BUG#57514 rpl_delayed_slave fails sporadically in pb
+rpl.rpl_delayed_slave                    # BUG#11764654 rpl_delayed_slave fails sporadically in pb
 rpl.rpl_innodb_bug28430                  # Bug#11754425
 rpl.rpl_heartbeat_basic                  # BUG#12403008 2011-04-27 sven fails sporadically
 rpl.rpl_row_ignorable_event              # BUG#12416768 2011-05-02 sven fails sporadically on pb2, result mistmatch in output from mysqlbinlog


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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: anitha.gopi@stripped
# target_branch: file:///home/anitha/mysql/repo/mysql-trunk/
# testament_sha1: d2e1d99de788f9908dcf7f14570a484ef39185e4
# timestamp: 2011-05-25 11:01:23 +0530
# source_branch: file:///home/anitha/mysql/repo/mysql-5.5/
# base_revision_id: anitha.gopi@stripped\
#   8kcrftq29ddoo2vd
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWcumh6MAAXv/gAAQQABYY//3
eoCCAL////BQA0d7bHXHRh3rwlEJpMp4JoxU/ENR6n6gp+kNJ6nqDQMiSbDVAbSaNExBkDAINMg0
kRvKjJk0yPU0PSaMhpk0GjQaCSUninpR+o9Sf6qHlNN6kaAAAaACSTTUABTaT0KeFND1NPUAGmmh
XdmvaBVFsYbKFkA77XtZarLdVIc2a57lVT59k8OetIrFnIrfvtmTt9ey0/FrKlLf0wjs191rs+eY
xRMvfDhQeKZjaIgFBWH1/GM4yNKRJakiOe+cngLgoldw7E7CIwc7LtExRQDEMIkJ7Csy61kk6pUm
9njeJjfpGjxDYcISiEG+sU/w/Oyu0obLRgkhJlNpY4rbB2xyv0GoaFNrVbFCbRbTVMoBJUsIwJ5b
CrKcvkHmGVh8Au3sQXaUCfwFAV7RT5t0fkSeoyFaJoJqtcXchD/w0CeEEq0NsHYr1zpcRAiBhOcQ
1gcrNTAdy2J1NLdkxlOCi7G+9Yc6DBXipEn8JwECwtjBXNSaREPnUKhcdCZC4mlFoYHIucCiSO+v
SrLbnUPiOHcJs7cM3RZKZPFovkUQ6aTTKQfGs3UwuhtGL5YdufoiG6MlUU8vDnftxfeUUvQ00aax
gBfWKNyMTef646QBJ1nUM6EukqbFVYF5gKz81UIYpOloXOzrjz6CLgNlfNi04AqRkBPNkC/6fe2j
MCw70jN4A6z63x5N2i3jKrsimdcQ7lgNWzfo5gWCQDSfrLkqoJQPxO7A3juW/7WcWMlkCHRvN3Y4
b/epfRzUy1TPXz8MHmhWlyMTca4rLPWIMZDUHFHo3qZ8jLXVT0YnLgUHXF+YmDCasFhxQi2ohuLA
S4P7qmTdHc0ki7g1vXxTUQaLGlTMzwC7z24vmFPQMQXPUUdfvmLU5BVtCWxfjXcFoWyHYYckV8WS
GIpz6cniSgmkb0/AVFC72NKZzNg0Ew4Q4O0vV6SSLIxAoZUyUi3fAXtkhUB7W3BKDy7JHoka2AxV
S0a780QootHc0kG9FBatE4sBcnWh7yAA9aCD1wBYCMUSE62+fBDM1Eza3BheJj2wBThLaDvRAhDE
108wXOsCG+t2QfeAL8GRhW+QDHMAlT1MqkBspooynU2BEinCB5XKjKBYvdiZkbMS7P8XckU4UJDL
poej


--===============1715645065==--