From: Date: August 13 2008 9:33pm
Subject: bzr commit into mysql-6.0-bugteam branch (mattiasj:2761) Bug#37402, Bug#35161
List-Archive: http://lists.mysql.com/commits/51557
X-Bug: 37402
Message-Id: <20080813193353.1968CEED769@witty.localhost>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

#At file:///Users/mattiasj/clones/bzrroot/pushfix-60-bugteam/

 2761 Mattias Jonsson	2008-08-13
      Post push fix for bug#35161 and bug#37402
modified:
  mysql-test/lib/mtr_report.pl
  mysql-test/suite/parts/t/disabled.def

per-file messages:
  mysql-test/lib/mtr_report.pl
    Bug#35161
    
    Supressing error in master.err/warnings
    since we are checking a corrupt table.
  mysql-test/suite/parts/t/disabled.def
    Bug#37402
    
    Disable partition_mgm_lcN_ndb since the crash
    master1 in 6.0 (works in 5.1)
=== modified file 'mysql-test/lib/mtr_report.pl'
--- a/mysql-test/lib/mtr_report.pl	2008-08-12 16:23:49 +0000
+++ b/mysql-test/lib/mtr_report.pl	2008-08-13 19:33:45 +0000
@@ -441,6 +441,7 @@ sub mtr_report_stats ($) {
                 /Incorrect key file for table '.\/mysqltest\/t_corrupted2.MAI'; try to repair it/ or
                 # Bug#35161, test of auto repair --myisam-recover
                 /able.*_will_crash/ or
+                /Got an error from unknown thread, ha_myisam.cc:/ or
 
                 # lowercase_table3 using case sensitive option on
                 # case insensitive filesystem (InnoDB error).

=== modified file 'mysql-test/suite/parts/t/disabled.def'
--- a/mysql-test/suite/parts/t/disabled.def	2008-08-12 16:23:49 +0000
+++ b/mysql-test/suite/parts/t/disabled.def	2008-08-13 19:33:45 +0000
@@ -12,3 +12,6 @@ ndb_dd_backuprestore           : Bug#326
 partition_mgm_lc0_archive      : Bug#38751 - add partition deletes all rows
 partition_mgm_lc1_archive      : Bug#38751 - add partition deletes all rows
 partition_mgm_lc2_archive      : Bug#38751 - add partition deletes all rows
+partition_mgm_lc0_ndb          : Bug#38778 - master1 crashes
+partition_mgm_lc1_ndb          : Bug#38778 - master1 crashes
+partition_mgm_lc2_ndb          : Bug#38778 - master1 crashes