From: Bjorn Munch Date: March 15 2011 10:00am Subject: bzr commit into mysql-trunk branch (bjorn.munch:3766) List-Archive: http://lists.mysql.com/commits/132984 Message-Id: <201103151000.p2FA0lmL021545@khepri15.norway.sun.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit #At file:///home/bm136801/my/main-tr/ based on revid:chuck.bell@stripped 3766 Bjorn Munch 2011-03-15 [merge] 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 15:48:27 +0000 +++ b/mysql-test/suite/rpl/r/rpl_slave_load_remove_tmpfile.result 2011-03-15 10:00:00 +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 15:48:27 +0000 +++ b/mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile.test 2011-03-15 10:00:00 +0000 @@ -56,6 +56,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 No bundle (reason: revision is a merge).