← Back to team overview

maria-developers team mailing list archive

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

 

#At lp:maria

 2859 knielsen@xxxxxxxxxxxxxxx	2010-05-10
      Suppress a safemutex warning pending fix of MBug#578117.
      modified:
        mysql-test/suite/pbxt/r/pbxt_xa.result
        mysql-test/suite/pbxt/t/pbxt_xa.test

=== modified file 'mysql-test/suite/pbxt/r/pbxt_xa.result'
--- a/mysql-test/suite/pbxt/r/pbxt_xa.result	2010-03-24 22:12:39 +0000
+++ b/mysql-test/suite/pbxt/r/pbxt_xa.result	2010-05-10 07:29:30 +0000
@@ -1,4 +1,5 @@
 drop table if exists t1, t2;
+CALL mtr.add_suppression("Found wrong usage of mutex 'LOCK_sync' and 'LOCK_active'");
 CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=innodb;
 CREATE TABLE t2 (b INT PRIMARY KEY) ENGINE=pbxt;
 BEGIN;

=== modified file 'mysql-test/suite/pbxt/t/pbxt_xa.test'
--- a/mysql-test/suite/pbxt/t/pbxt_xa.test	2010-03-24 22:12:39 +0000
+++ b/mysql-test/suite/pbxt/t/pbxt_xa.test	2010-05-10 07:29:30 +0000
@@ -4,6 +4,11 @@
 drop table if exists t1, t2;
 --enable_warnings
 
+# This warning is indication of a real bug, MBug#578117.
+# But it is not a regression, so we suppress it to get a clean test run.
+# This suppression must be removed as part of MBug#578117 fix.
+CALL mtr.add_suppression("Found wrong usage of mutex 'LOCK_sync' and 'LOCK_active'");
+
 #
 # bug lp:544173, xa crash with two 2pc-capable storage engines without binlog
 #