bk commit into 5.1 tree (msvensson:1.2642)

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-11-26 16:31:35+01:00, msvensson@stripped +1 -0
  Add suppressions for expected warning messages that appears in
  slave's error log when running rpl_extraColmaster_*.test 

  mysql-test/lib/mtr_report.pl@stripped, 2007-11-26 16:31:33+01:00, msvensson@stripped
+9 -1
    Add suppressions for expected warning messages that appears in
    slave's error log when running rpl_extraColmaster_*.test 

diff -Nrup a/mysql-test/lib/mtr_report.pl b/mysql-test/lib/mtr_report.pl
--- a/mysql-test/lib/mtr_report.pl	2007-11-20 20:51:34 +01:00
+++ b/mysql-test/lib/mtr_report.pl	2007-11-26 16:31:33 +01:00
@@ -346,7 +346,15 @@ sub mtr_report_stats ($) {
 
                 # BUG#29839 - lowercase_table3.test: Cannot find table test/T1
                 #             from the internal data dictiona
-                /Cannot find table test\/BUG29839 from the internal data dictionary/
+                /Cannot find table test\/BUG29839 from the internal data dictionary/ or
+
+		# rpl_extrColmaster_*.test, the slave thread produces warnings
+		# when it get updates to a table that has more columns on the
+		# master
+		/Slave: Unknown column 'c7' in 't15' Error_code: 1054/ or
+		/Slave: Can't DROP 'c7'.* 1091/ or
+		/Slave: Key column 'c6'.* 1072/
+
 	       )
             {
               next;                       # Skip these lines