summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@oracle.com>2012-02-02 12:13:35 +0200
committerMarko Mäkelä <marko.makela@oracle.com>2012-02-02 12:13:35 +0200
commit99ce9430141f7c834840234935e4557d9311eef4 (patch)
tree68dcca942c8cdb4286fcbaec4404d130139f9d07 /mysql-test
parenta076427ffd95d23790e07fe1ab38cbc735f8c713 (diff)
parented822984e1397745310e11ca6c71092ef587e24f (diff)
downloadmariadb-git-99ce9430141f7c834840234935e4557d9311eef4.tar.gz
Merge mysql-5.1 to mysql-5.5.
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/suite/innodb/t/innodb_bug34300.test2
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/suite/innodb/t/innodb_bug34300.test b/mysql-test/suite/innodb/t/innodb_bug34300.test
index 68c385fd72a..216fad1fa07 100644
--- 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;