From: Bjorn Munch
Date: March 31 2011 1:48pm
Subject: bzr commit into mysql-5.1-mtr branch (bjorn.munch:2993)
List-Archive: http://lists.mysql.com/commits/134364
Message-Id: <201103311348.p2VDmDZd012711@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0232721784=="

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

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

 2993 Bjorn Munch	2011-03-31
      One more test suppression for rpl_extra_col_master tests

    modified:
      mysql-test/extra/rpl_tests/rpl_extra_col_master.test
=== modified file 'mysql-test/extra/rpl_tests/rpl_extra_col_master.test'
--- a/mysql-test/extra/rpl_tests/rpl_extra_col_master.test	2011-03-31 08:33:07 +0000
+++ b/mysql-test/extra/rpl_tests/rpl_extra_col_master.test	2011-03-31 13:48:05 +0000
@@ -128,6 +128,7 @@ call mtr.add_suppression("Slave.*Can.t D
 call mtr.add_suppression("Slave.*Unknown column .c7. in .t15.* Error_code: 1054");
 call mtr.add_suppression("Slave.*Key column .c6. doesn.t exist in table.* Error_code: 1072");
 call mtr.add_suppression("Slave I/O: Get master clock failed with error:.* Error_code: 2013");
+call mtr.add_suppression("Slave I/O: Get master SERVER_ID failed with error:.* Error_code: 2013");
 --enable_query_log
 
 sync_slave_with_master;


--===============0232721784==
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/supp-51/
# testament_sha1: 61d72ebea5ef37ab05d41130ac4e4a2511caf45f
# timestamp: 2011-03-31 15:48:13 +0200
# source_branch: file:///home/bm136801/my/main-51/
# base_revision_id: bjorn.munch@stripped\
#   jx0dtj3ifbnm51up
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWYN94jEAAXTfgAAQUHP//1ai
mQC////wUAOa9rrNcGnOo7CSgRNNNqm1PKn6nooe01NhTSPSPSaZqZpBlNSNgTTJNqmT0R6jIeoA
A0DQJJATQAmCo8o0NAAaHqNBoMAAAAAAAAAAAkomSepjUam1PIZGRAGgyA00CzfVvt1/pjyY3upW
EGB0XZ6wfCN/umzMde5fqEmXRzubWc+6H6m9oYPf6dfOiHrTpYmPe1xCOyT+U7W8M069qNd+VGC4
iLz6uhl7lVby2C4l1+o0Pu1JEUhtfCTG/TbKhjNbPXshPZiEi14Lt5idGBuawCD9k9d8blOErhVZ
9K8CkgIlRYUdVAhwpHUOhmGxJ2b5xUpo81zNMMGsDIyDY5T0ZhBCtKBB3higRNwpHjI1ZiixpEp3
MDKUD4OCOtsZEhtJFgiR7hRKamkZ8gsba+vkv2bf4WivR42L4PyF0IyQ3QyMyReJpQxFo2/qTzhV
BpjaxdduVX4F5sSkKohXzWb6Emzvmow4InI4wjLkzit7zhIZ4A1xDXg8tdKhZdfYyLobtq2PEDig
wLTbQhthvpkRsyTTs4/PintMrHItpCGbRycQcmk0CUHySs5Vcjw0xssaw4c7uKRAmYMPTPxf0/3Y
vdk8ugdq9zari4rYVNihx39skCuFsAclKOmXHxakX5yfaiAcOOLinW2nUj7gfNWflhWMxMTB/5uD
ebhjekxYnUGQPnnHbjrxtQtsou5rEj2Mkb0iNu8jRojdaW1Sx5UrQmd49T9vMTyuNbKLiaCh89mq
9oLypx0jvOnPG7Zk1r1gZDrVVZs0RVVPJ25TftBroOIqNszfehl3T9sNLgsoo6uCwcskQsMY4GgV
0hJeX64rcMPDB+5iidLyZGV1bELYEvqOFCdSF1ZRytTISq0qUXlP1DV0rpdZULYG62odrisQuO7q
4SJFZYrYMjoCeYtCGoWQHuDpCUZ74yTZOkMVRcWb9tEBGxMvzEDSmXUGcjOUpOZeP+iRrxZbRMkN
qxPKxkiQd8XVYKpD2TBt8zJRvaF7AUotzzEw/UjALPQesYK96pbLgm18MygaqVqJP0ZOJQKzlX3D
t63XMHYPHD05JMbuiiws7MTAVPJUgK3VYE/vURzKfhqwavk2b3XqlInAOivfb1b41pckWA4YxpCF
h2vc7cczK1ifo9NHlLW3UsEza8CJpaQlS1IXag/F2z+eSPEuA2+YLYHOGcmZXM4ynejaoNwHgVLx
ITYCdGcxf4u5IpwoSEG+8RiA


--===============0232721784==--