bzr push into mysql-5.5 branch (bjorn.munch:3367 to 3368)

[Bjorn Munch]

 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
 3367 Chuck Bell	2011-03-14 [merge]
      Local merger for BUG#59752

    modified:
      mysql-test/r/archive_plugin.result
      mysql-test/r/blackhole_plugin.result
      mysql-test/r/func_analyse.result
      mysql-test/t/archive_plugin.test
      mysql-test/t/blackhole_plugin.test
      mysql-test/t/file_contents.test
      mysql-test/t/func_analyse.test
      sql/mysqld.cc
      sql/sql_analyse.cc
=== 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
 

No bundle (reason: useless for push emails).