← Back to team overview

maria-developers team mailing list archive

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

 

#At lp:maria

 2769 knielsen@xxxxxxxxxxxxxxx	2009-11-24
      After-merge fix for MySQL 5.1.41 merge: suppress some warnings during shutdown.
      
      The MySQL 5.1.41 merge adds back some more warning lines in error log to be
      checked. So some suppressions for these new ones need to be added to the code
      in MariaDB that checks for warnings during server shutdown (MySQL only checks
      for warnings that occur while executing the test cases themselves).
      modified:
        mysql-test/mysql-test-run.pl

=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2009-11-23 14:04:17 +0000
+++ b/mysql-test/mysql-test-run.pl	2009-11-24 09:34:42 +0000
@@ -3983,6 +3983,13 @@ sub extract_warning_lines ($) {
      qr/error .*connecting to master/,
      qr/InnoDB: Error: in ALTER TABLE `test`.`t[12]`/,
      qr/InnoDB: Error: table `test`.`t[12]` does not exist in the InnoDB internal/,
+     qr/Slave: Unknown table 't1' Error_code: 1051/,
+     qr/Slave SQL:.*(Error_code: [[:digit:]]+|Query:.*)/,
+     qr/slave SQL thread aborted/,
+     qr/unknown option '--loose-/,
+     qr/unknown variable 'loose-/,
+     qr/Now setting lower_case_table_names to [02]/,
+     qr/deprecated/,
     );
 
   my $match_count= 0;