summaryrefslogtreecommitdiff
path: root/mysql-test/suite
diff options
context:
space:
mode:
authorVasil Dimov <vasil.dimov@oracle.com>2012-02-21 18:20:12 +0200
committerVasil Dimov <vasil.dimov@oracle.com>2012-02-21 18:20:12 +0200
commitc538ba96cd416c2194a0efbbee147c48a6a0abdb (patch)
tree00e0be9a92e5afbd4d90574cea6f941dc01f1d28 /mysql-test/suite
parent55663cbb62d73c752cea3e1a90f54b4f6464ee73 (diff)
parentc2d0fea84e25aca620e7e6922de234e38a24703a (diff)
downloadmariadb-git-c538ba96cd416c2194a0efbbee147c48a6a0abdb.tar.gz
Merge mysql-5.1 -> mysql-5.5
Diffstat (limited to 'mysql-test/suite')
-rw-r--r--mysql-test/suite/innodb/t/innodb_bug34300.test1
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/suite/innodb/t/innodb_bug34300.test b/mysql-test/suite/innodb/t/innodb_bug34300.test
index 216fad1fa07..7f0adfcaba2 100644
--- a/mysql-test/suite/innodb/t/innodb_bug34300.test
+++ b/mysql-test/suite/innodb/t/innodb_bug34300.test
@@ -9,6 +9,7 @@
-- disable_result_log
call mtr.add_suppression("InnoDB: Warning: a long semaphore wait:");
+call mtr.add_suppression("the age of the last checkpoint is");
# set packet size and reconnect
let $max_packet=`select @@global.max_allowed_packet`;