diff options
author | Sergei Golubchik <serg@mariadb.org> | 2015-02-18 15:16:27 +0100 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2015-02-18 15:16:27 +0100 |
commit | d7e7862364ae344fea5657eb5aae9db3fbb84553 (patch) | |
tree | 38f30e541f98dae9092a09cf030de8f2a336bfd1 /storage/innobase/ibuf/ibuf0ibuf.cc | |
parent | a06624d61f36c70edd63adcfe2803bb7a8564de5 (diff) | |
parent | fdd6c111c254c5044cd9b6c2f7e4d0c74f427a79 (diff) | |
download | mariadb-git-d7e7862364ae344fea5657eb5aae9db3fbb84553.tar.gz |
Merge branch '5.5' into 10.0
Diffstat (limited to 'storage/innobase/ibuf/ibuf0ibuf.cc')
-rw-r--r-- | storage/innobase/ibuf/ibuf0ibuf.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/storage/innobase/ibuf/ibuf0ibuf.cc b/storage/innobase/ibuf/ibuf0ibuf.cc index 2082c0d194b..e4e7ecce53a 100644 --- a/storage/innobase/ibuf/ibuf0ibuf.cc +++ b/storage/innobase/ibuf/ibuf0ibuf.cc @@ -2837,6 +2837,14 @@ ibuf_contract_in_background( mutex_exit(&ibuf_mutex); } +#if defined UNIV_DEBUG || defined UNIV_IBUF_DEBUG + if (ibuf_debug) { + return(0); + } +#endif /* UNIV_DEBUG || UNIV_IBUF_DEBUG */ + + + while (sum_pages < n_pages) { ulint n_bytes; |