summaryrefslogtreecommitdiff
path: root/mysql-test/include/mtr_warnings.sql
diff options
context:
space:
mode:
authorJan Lindström <jplindst@mariadb.org>2014-07-25 10:30:16 +0300
committerJan Lindström <jplindst@mariadb.org>2014-07-25 10:30:16 +0300
commita3acd725704c99dcb8a7a0d0c7c47e43c33a6cd7 (patch)
treeb980bdd63882167d23c4e03efff065af615cd88a /mysql-test/include/mtr_warnings.sql
parent6192f0bffa798c01acc85db9f427ed02234aead4 (diff)
downloadmariadb-git-a3acd725704c99dcb8a7a0d0c7c47e43c33a6cd7.tar.gz
Merge InnoDB fixes from 5.5 revisions 4229, 4230, 4233, 4237 and 4238 i.e.
4229: MDEV-5670: Assertion failure in file buf0lru.c line 2355 Add more status information if repeatable. 4230: MDEV-5673: Crash while parallel dropping multiple tables under heavy load Improve long semaphore wait output to include all semaphore waits and try to find out if there is a sequence of waiters. 4233: Fix compiler errors on product build. 4237: Fix too agressive long semaphore wait output and add guard against introducing compression failures on insert buffer. 4238: Fix test failure caused by simulated compression failure on IBUF_DUMMY table.
Diffstat (limited to 'mysql-test/include/mtr_warnings.sql')
-rw-r--r--mysql-test/include/mtr_warnings.sql1
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/include/mtr_warnings.sql b/mysql-test/include/mtr_warnings.sql
index 0ad1079cd92..9d97d23897c 100644
--- a/mysql-test/include/mtr_warnings.sql
+++ b/mysql-test/include/mtr_warnings.sql
@@ -159,6 +159,7 @@ INSERT INTO global_suppressions VALUES
("InnoDB: Error: in ALTER TABLE `test`.`t[123]`"),
("InnoDB: Error: in RENAME TABLE table `test`.`t1`"),
("InnoDB: Error: table `test`.`t[123]` .*does not exist in the InnoDB internal"),
+ ("InnoDB: Warning: semaphore wait:"),
/*
BUG#32080 - Excessive warnings on Solaris: setrlimit could not