Merge mysql-5.1 to mysql-5.5.

49738655 · Marko Mäkelä · 5068aec9 · 647abc13 · 49738655
Commit 49738655 authored Feb 02, 2012 by Marko Mäkelä
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

mysql-test/suite/innodb/t/innodb_bug34300.test mysql-test/suite/innodb/t/innodb_bug34300.test +2 -0

No files found.
--- 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;