bzr commit into mysql-5.5-innodb branch (vasil.dimov:3283)

[vasil.dimov]

#At file:///usr/local/devel/bzrroot/server/mysql-5.5-innodb/ based on revid:marko.makela@stripped

 3283 Vasil Dimov	2011-01-12 [merge]
      Merge mysql-5.1-innodb -> mysql-5.5-innodb

    modified:
      mysql-test/suite/innodb/t/innodb_bug56143.test
=== modified file 'mysql-test/suite/innodb/t/innodb_bug56143.test'
--- a/mysql-test/suite/innodb/t/innodb_bug56143.test	revid:marko.makela@stripped
+++ b/mysql-test/suite/innodb/t/innodb_bug56143.test	revid:vasil.dimov@stripped
@@ -8,6 +8,11 @@
 -- disable_query_log
 -- disable_result_log
 
+if ($VALGRIND_TEST)
+{
+  call mtr.add_suppression("InnoDB: Warning: a long semaphore wait:");
+}
+
 SET foreign_key_checks=0;
 
 DROP TABLE IF EXISTS bug56143_1;

No bundle (reason: revision is a merge).