diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-05-09 16:52:45 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-05-09 16:52:45 +0300 |
| commit | e9f26097474607efd31f31f25ed9321dac195cab (patch) | |
| tree | 867b14c3e4c1f1ee50c4db449b853860dd087df0 /storage/innobase/ibuf | |
| parent | 9be99dac90147cfb3477c07b75328eb0d7d636e7 (diff) | |
| parent | fe95cb2e40d73adbbe88efa0e7f48c055ccd042f (diff) | |
| download | mariadb-git-e9f26097474607efd31f31f25ed9321dac195cab.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'storage/innobase/ibuf')
| -rw-r--r-- | storage/innobase/ibuf/ibuf0ibuf.cc | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/storage/innobase/ibuf/ibuf0ibuf.cc b/storage/innobase/ibuf/ibuf0ibuf.cc index d0f729e0d60..3a278a70938 100644 --- a/storage/innobase/ibuf/ibuf0ibuf.cc +++ b/storage/innobase/ibuf/ibuf0ibuf.cc @@ -4256,15 +4256,12 @@ ibuf_restore_pos( return(TRUE); } - if (fil_space_get_flags(space) == ULINT_UNDEFINED) { - /* The tablespace has been dropped. It is possible - that another thread has deleted the insert buffer - entry. Do not complain. */ - ibuf_btr_pcur_commit_specify_mtr(pcur, mtr); - } else { - ib::error() << "ibuf cursor restoration fails!." + if (fil_space_t* s = fil_space_acquire_silent(space)) { + ib::error() << "ibuf cursor restoration fails!" " ibuf record inserted to page " - << space << ":" << page_no; + << space << ":" << page_no + << " in file " << s->chain.start->name; + s->release(); ib::error() << BUG_REPORT_MSG; @@ -4274,10 +4271,9 @@ ibuf_restore_pos( rec_print_old(stderr, page_rec_get_next(btr_pcur_get_rec(pcur))); - - ib::fatal() << "Failed to restore ibuf position."; } + ibuf_btr_pcur_commit_specify_mtr(pcur, mtr); return(FALSE); } |