From: Bjorn Munch
Date: March 15 2011 9:58am
Subject: bzr commit into mysql-5.5 branch (bjorn.munch:3368)
List-Archive: http://lists.mysql.com/commits/132983
Message-Id: <201103150959.p2F9x1Dd021521@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1021639772=="

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

#At file:///home/bm136801/my/main-55/ based on revid:chuck.bell@stripped

 3368 Bjorn Munch	2011-03-15
      Add warning suppression to test rpl.rpl_slave_load_remove_tmpfile

    modified:
      mysql-test/suite/rpl/r/rpl_slave_load_remove_tmpfile.result
      mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile.test
=== modified file 'mysql-test/suite/rpl/r/rpl_slave_load_remove_tmpfile.result'
--- a/mysql-test/suite/rpl/r/rpl_slave_load_remove_tmpfile.result	2011-02-24 14:48:35 +0000
+++ b/mysql-test/suite/rpl/r/rpl_slave_load_remove_tmpfile.result	2011-03-15 09:58:54 +0000
@@ -15,4 +15,5 @@ drop table t1;
 call mtr.add_suppression("Slave: Can't get stat of .*");
 call mtr.add_suppression("Slave SQL: Error .Can.t get stat of.* Error_code: 13");
 call mtr.add_suppression("Slave: File.* not found.*");
+call mtr.add_suppression("Slave SQL: Error .File.* not found.* Error_code: 29");
 include/rpl_end.inc

=== modified file 'mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile.test'
--- a/mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile.test	2011-02-24 14:48:35 +0000
+++ b/mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile.test	2011-03-15 09:58:54 +0000
@@ -62,6 +62,7 @@ drop table t1;
 call mtr.add_suppression("Slave: Can't get stat of .*");
 call mtr.add_suppression("Slave SQL: Error .Can.t get stat of.* Error_code: 13");
 call mtr.add_suppression("Slave: File.* not found.*");
+call mtr.add_suppression("Slave SQL: Error .File.* not found.* Error_code: 29");
 --let $rpl_only_running_threads= 1
 --source include/rpl_end.inc
 


--===============1021639772==
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/main-55/
# testament_sha1: b0f579de71799afcc0aaff76c3c4d7f8b717408f
# timestamp: 2011-03-15 10:59:01 +0100
# source_branch: file:///home/bm136801/my/mtr-55/
# base_revision_id: chuck.bell@stripped\
#   0vl89i702z9v3gg3
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWbHgVMcAAgnfgAAQUHP//3MG
KAC////wUAS+p6ABT0p11XoCUUj1GhmoyD1NNAAaBpoaACNSnlB4moyMCD1DQGTQYIyAymk1NlNM
geoyaaDQAAABhFRGpPEmmjNT1PU9NRtTRoNAA0NMJJCNAaaTEamJkGjVNpqNo9UZMNhu0Yb4vJGe
Lga6qtKAyMTJ745Zwg93YmepeMyoq9eaSKeGPqQSjY2KyIVGz1yQh5BR9aT9i8Pl95FH14PC2qWx
RLdmK3U5HQIeA4RaeG+R5BFfG9m+gdkLbZICwdszOOdhBiBwL65lpwVAlakNwagfjmKD/JKc8WZm
iam6AaoI4sUCfBipoCBXEnHg4oDYBiEE43FZRC2vsdUSFda5RgcPJ6FgSPc0Nels0KkhQ+HjtLdJ
6dgvemKj/rZlAGoxUZjhvHCtd+pvLCRtsDMwMzbpMM5I1QF5IvJjG3DWkK+40M80bbdhxcpx2m+o
gOxpSVBiQMiOMTSVrzGpR9FP8psmpdSBKKIQYcipTmcYFyi1Aw+tNqqqyzX9FBIDZ4VAOnqWlgwF
xqMc5rmrAGOWRUY74EAKbn1X0FrrBw6+037NE1W2rbbQXF5be8LiJLDlsj1MTurOKY3cpznrUV41
FB3XwBtXfvGRYbqcPD0KdSI5S4gbwOD7MFhF1LigdseVm9jgMFZccN23K4uiVAMeU+6ZTJcVA/0n
O0ja9Y4K6kotamQ5QcDRaCrRTFvc5+664FnqauYeMcfocfkbkyDlEtZmZm7PfeG8+478DFxeHzIh
NjEZEggwk7ss5IJLAkRmZxtImBputjSB/GviF2LmWSMKEXBrV7exkXx9aUvepaIIAdaiRZI6GhoT
/Q/xa03aKAcjxOKYd9/YHdeiXMqMCY0Dr1hoZH+Ug5Iy+ArQE9g8EsmcqyHCSmwIqNzZonAKcBdW
1GCUSwuPD86UnLoO7FK7eBoBfHsaCRhpd2HfBsuoOZE8z1KSXyc68LyxDlQMpnzuPMZ4GtddE2n3
Ixao/iDSd4MhUBiD33KZ55WlgCIChEIrQQigVw/vNmbzzDc4xMz0ZPeYrqZHkf2O3uOjDbX811zF
ivc8BLuFX2Hq9Fpy9lyJR1Q1PJSDcfoZKBlD1RDZ9OiqxgY8yDjRd3VjawCYeOmdEJQcuwxITJQY
Cs8uYSR6kOMN+icoLoFSD6laXfAJiTJOxGLqWzxM6x9zJajAh0aGojwl8sbKTW4Hsps1mYC261OZ
yQ3JlUOJ3MhUooYqj31EhUMDK3pKwxWwqzkVaANM47haEpcAb5npM0i1qheWd9eXe4YLoqxlgIfz
zByp2FxtKzu45EFBCJwVCVY1qa6E42KACVoVmIsh6qjGDD2ETi+Jgt5Drd2AJLCJEOIniw5K8+xY
gqRAc6bzrnIu8m500OPwEDgAzpmFulg4Gwsu3YHDBVXowXeNFgln6J1JsA8XfutIkbyAP+D6L3Ay
QRUl3nBHzX21NJGlUUOyY5kxoF4GLrVKGVawPMjWQAsA/gu5IpwoSFjwKmOA


--===============1021639772==--