From: Alexander Nozdrin
Date: November 18 2010 9:07am
Subject: bzr commit into mysql-trunk branch (alexander.nozdrin:3350)
List-Archive: http://lists.mysql.com/commits/124231
Message-Id: <201011180906.oAI2xIbk007760@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4957222810099802205=="

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

#At file:///home/alik/MySQL/bzr/mysql-trunk-bugfixing/ based on revid:dao-gang.qu@stripped

 3350 Alexander Nozdrin	2010-11-18
      Make rpl.rpl_get_master_version_and_clock experimental due to 57198.

    modified:
      mysql-test/collections/default.experimental
=== modified file 'mysql-test/collections/default.experimental'
--- a/mysql-test/collections/default.experimental	2010-11-16 06:46:10 +0000
+++ b/mysql-test/collections/default.experimental	2010-11-18 09:07:14 +0000
@@ -28,6 +28,7 @@ perfschema.func_file_io                 
 perfschema.start_server_on               # Bug#55576 2010-08-02 alik Two perfschema tests failed on mysql-next-mr-innodb PB2 tests#
 perfschema.server_init                   # Bug#55576 2010-08-02 alik Two perfschema tests failed on mysql-next-mr-innodb PB2 tests#
 
+rpl.rpl_get_master_version_and_clock*    # Bug#57918 2010-11-18 alik rpl_get_master_version_and_clock times out sporadically
 rpl.rpl_heartbeat_basic                  # BUG#54820 2010-06-26 alik rpl.rpl_heartbeat_basic fails sporadically again
 rpl.rpl_innodb_bug28430*                 # Bug#46029
 rpl.rpl_row_sp011* @solaris              # Bug#47791 2010-01-20 alik Several test cases fail on Solaris with error Thread stack overrun


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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: alexander.nozdrin@stripped\
#   0cx9ixbzk3ieix6a
# target_branch: file:///home/alik/MySQL/bzr/mysql-trunk-bugfixing/
# testament_sha1: cc440f74d89849befc210646765e8089a677cfe8
# timestamp: 2010-11-18 12:07:19 +0300
# source_branch: file:///home/alik/MySQL/bzr/mysql-trunk/
# base_revision_id: dao-gang.qu@stripped\
#   y7r78x9qcy9sh1ii
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWbCV8QQAAXxfgEAQWHP/93ID
AAC////wUAOl3d2qvcK7d7W7eGU0gjTZGmpT/QjKnqfiBPU9U3qR5E0wySp+mU8BTyTKbFGmgAAA
aBJE0KepPITE9TTINNAAAACKUZGpGmaNQ8oPUaAAAABJFNU/UYJqNPBJ+qG1PUBkAAaJRZ9K1xDn
VoLKIMAEe5Ja5Vw2tL0dz2qUoa+p8xSNQ1LRqKlh4l9/fRVulPnYhkkoWEXOyZTeFvQIoG/Wyqe4
AeHwtIfIIW3rGRyw+MnMwLp4uKE63naALy8XtjqxfJiRF7GzldEKSU9pNdcmDMavfXaOVlvcTah3
KEE1NX9gmrGuMopuRzUswjvxrdgZHtQRYRE78U8BVSPZ8oMDzEWG6wLbPXTnEQL50pPBGwEA8JZX
yPiih0QEO6LGUy3QVKDMXXoBkX54BYhMbGqSTNHAamGyii6QoNLOqrAupe6mfZxaLaiU6EZ5Gcg1
yJQFtC0MZsr2uFaIEUWOxosLnurdEzSD3ngDyKzHAb5eBxOtBfLBNvWVaZyWBuV2PStVnVWFBYwe
bm3iUxkXI0KN1JLIC8Yxdg8aa47sSBYzrTjCGM0KnLaeZyc5JnaCoUq2TwOvX1YDtvcfp3UA/V04
7Ax83Sg8VStieuKGW7NzqWCJgtMOG+IE7aOiiYPykOO4QCk8v09H7Jvo4ED2Nh57yLwXnrHALZyG
XYb0FvoGxdqQcQNoEm3p3snX0wcOEmtigiAC08syQ/ZOD/yiVZLGY3MKRnfxijKjMYnhmSs5CA7j
2TAadyAyvrnrchAbVK4ZJvxGTOvDoO6MkA9axkImfkX44OVM43xA3N5qj+HN5aHsnWRERheHbAIp
tFTGpThag261Qo7b9f6sKw7F5S4UjTrRVagwGSzgbnEL7mOniURANm40wGVkfKBSp7wWtG86YF4F
xvUQMgJ+P5tsu8l3MBy4BbBao2SxLmMWyFKrmDdMHjmWBWFbkzDKqkBiP3EI0btsqp1QhIvWxUsj
hYwpEGkaZFkw4EBx2VhANdVTGyfQBPUhOGGDHho6XRbcjRWLNA/gLpwoTutNnCQGd0LWZOSMg01l
LKTwvpyM8HwxxhTrYc6MpJTK4sygNaFHeldZbnqigVqyfTtjLF2Zcjl+xcCZ8RmbJ8YzOrBsTPhm
5VJ6LUFAVVBRgGtv1rgNymgPAsxRtzmw989++hgXpSwicHdDv0TOy4bx2NqFawF8O0cxhpZtGV2l
DMPBm7K+xdyRThQkLCV8QQA=


--===============4957222810099802205==--