← Back to team overview

maria-developers team mailing list archive

bzr commit into MariaDB 5.1, with Maria 1.5:maria branch (knielsen:2774)

 

#At lp:maria

 2774 knielsen@xxxxxxxxxxxxxxx	2009-11-26
      After-merge fixes for merge of MySQL 5.1.41 into MariaDB: more post-shutdown warning fixes.
      modified:
        mysql-test/mysql-test-run.pl

=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2009-11-26 07:45:54 +0000
+++ b/mysql-test/mysql-test-run.pl	2009-11-26 08:02:33 +0000
@@ -3992,7 +3992,8 @@ sub extract_warning_lines ($) {
      qr/Setting lower_case_table_names=2/,
      qr/deprecated/,
      qr/Slave SQL thread retried transaction/,
-     qw/Slave \(additional info\)/,
+     qr/Slave \(additional info\)/,
+     qr/Incorrect information in file/,
     );
 
   my $match_count= 0;