diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-08-28 15:05:46 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-08-28 15:05:46 +0300 |
| commit | 11352d52cd35f89b1d573405fca92932e112cba9 (patch) | |
| tree | 77e2880d62fca5c7aa93d4a6bcfa299606e7f831 /storage/innobase/ibuf | |
| parent | 61096ff214dec68a66efb811aa3a70ef49f06a11 (diff) | |
| parent | 582545a38421ea0e43f326db84550773411c3261 (diff) | |
| download | mariadb-git-11352d52cd35f89b1d573405fca92932e112cba9.tar.gz | |
Merge 10.0 into 10.1
Diffstat (limited to 'storage/innobase/ibuf')
| -rw-r--r-- | storage/innobase/ibuf/ibuf0ibuf.cc | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/storage/innobase/ibuf/ibuf0ibuf.cc b/storage/innobase/ibuf/ibuf0ibuf.cc index 5398deeefcb..3c4955b5c9e 100644 --- a/storage/innobase/ibuf/ibuf0ibuf.cc +++ b/storage/innobase/ibuf/ibuf0ibuf.cc @@ -2175,6 +2175,8 @@ ibuf_remove_free_page(void) page_t* root; page_t* bitmap_page; + log_free_check(); + mtr_start(&mtr); /* Acquire the fsp latch before the ibuf header, obeying the latching @@ -2286,22 +2288,7 @@ ibuf_free_excess_pages(void) { ulint i; -#ifdef UNIV_SYNC_DEBUG - ut_ad(rw_lock_own(fil_space_get_latch(IBUF_SPACE_ID, NULL), - RW_LOCK_EX)); -#endif /* UNIV_SYNC_DEBUG */ - - ut_ad(rw_lock_get_x_lock_count( - fil_space_get_latch(IBUF_SPACE_ID, NULL)) == 1); - - /* NOTE: We require that the thread did not own the latch before, - because then we know that we can obey the correct latching order - for ibuf latches */ - - if (!ibuf) { - /* Not yet initialized; not sure if this is possible, but - does no harm to check for it. */ - + if (srv_force_recovery >= SRV_FORCE_NO_IBUF_MERGE) { return; } |