Merge mysql-5.1 to mysql-5.5.

--BZR-- revision-id: marko.makela@oracle.com-20120202101335-jln2u3lq8cx4sn6t property-branch-nick: mysql-5.5 testament3-sha1: 87e68d966281a9a8e4a338100dffee5591f2e45b
twitter-forks · Feb 2, 2012 · 97d4677 · 97d4677
2 parents ed36599 + b91f968
commit 97d4677
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/mysql-test/suite/innodb/t/innodb_bug34300.test b/mysql-test/suite/innodb/t/innodb_bug34300.test
@@ -8,6 +8,8 @@
 -- disable_query_log
 -- disable_result_log
 
+call mtr.add_suppression("InnoDB: Warning: a long semaphore wait:");
+
 # set packet size and reconnect 
 let $max_packet=`select @@global.max_allowed_packet`;
 SET @@global.max_allowed_packet=16777216;