diff options
| author | Jan Lindström <jplindst@mariadb.org> | 2014-07-25 10:30:16 +0300 |
|---|---|---|
| committer | Jan Lindström <jplindst@mariadb.org> | 2014-07-25 10:30:16 +0300 |
| commit | a3acd725704c99dcb8a7a0d0c7c47e43c33a6cd7 (patch) | |
| tree | b980bdd63882167d23c4e03efff065af615cd88a /storage/innobase/page | |
| parent | 6192f0bffa798c01acc85db9f427ed02234aead4 (diff) | |
| download | mariadb-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 'storage/innobase/page')
| -rw-r--r-- | storage/innobase/page/page0zip.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/storage/innobase/page/page0zip.cc b/storage/innobase/page/page0zip.cc index 3b80236eb47..4b19a35925e 100644 --- a/storage/innobase/page/page0zip.cc +++ b/storage/innobase/page/page0zip.cc @@ -1314,8 +1314,10 @@ page_zip_compress( records. */ if (srv_simulate_comp_failures + && !dict_index_is_ibuf(index) && page_get_n_recs(page) >= 2 - && ((ulint)(rand() % 100) < srv_simulate_comp_failures)) { + && ((ulint)(rand() % 100) < srv_simulate_comp_failures) + && strcasecmp(index->table_name, "IBUF_DUMMY") != 0) { #ifdef UNIV_DEBUG fprintf(stderr, |