diff options
| author | Jan Lindström <jplindst@mariadb.org> | 2015-02-09 16:14:27 +0200 |
|---|---|---|
| committer | Jan Lindström <jplindst@mariadb.org> | 2015-02-09 16:14:27 +0200 |
| commit | 44a9e3f7b4c908dc4ccc36a5ae48a281cd6dba88 (patch) | |
| tree | f54ae4c167344f12e9299db7b844206e4b6c9164 /storage/innobase/ibuf | |
| parent | 919f40e464e4f6d0f6368b1065b43aaebaf7b681 (diff) | |
| download | mariadb-git-44a9e3f7b4c908dc4ccc36a5ae48a281cd6dba88.tar.gz | |
MDEV-7139: Sporadic failure in innodb.innodb_corrupt_bit on P8
The testcase fails randomly due to ibuf merge happening in the background.
Fix not to do any merges with ibuf_debug enabled.
Diffstat (limited to 'storage/innobase/ibuf')
| -rw-r--r-- | storage/innobase/ibuf/ibuf0ibuf.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/storage/innobase/ibuf/ibuf0ibuf.c b/storage/innobase/ibuf/ibuf0ibuf.c index d22fc8b9962..eee5402daa7 100644 --- a/storage/innobase/ibuf/ibuf0ibuf.c +++ b/storage/innobase/ibuf/ibuf0ibuf.c @@ -2731,6 +2731,14 @@ ibuf_contract_for_n_pages( ulint n_bytes; ulint n_pag2; +#if defined UNIV_DEBUG || defined UNIV_IBUF_DEBUG + if (ibuf_debug) { + return(0); + } +#endif /* UNIV_DEBUG || UNIV_IBUF_DEBUG */ + + + while (sum_pages < n_pages) { n_bytes = ibuf_contract_ext(&n_pag2, sync); |