1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-23566 SIGSEGV in mtr_t::init

Browse Source 
mtr_t::init(): Correct the debug assertion that was added in
commit c89366866bca2df46b0592719a1f6b6dabf470cb (MDEV-22970).
When the original failure scenario involves the system tablespace,
we could have m_user_space==nullptr. Let us compare m_user_space_id
instead.
This commit is contained in:
Marko Mäkelä 2020-08-25 15:25:22 +03:00
parent 65ee216c35
commit d8ba2930d6
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
storage/innobase/include/mtr0log.h
View File

@ -513,7 +513,8 @@ inline void mtr_t::init(buf_block_t *b)
{ {
if (UNIV_LIKELY_NULL(m_freed_pages)) if (UNIV_LIKELY_NULL(m_freed_pages))
{ {
ut_ad(m_user_space->id == b->page.id().space()); ut_ad(m_log_mode != MTR_LOG_ALL ||
m_user_space_id == b->page.id().space());
if (m_freed_pages->remove_if_exists(b->page.id().page_no()) && if (m_freed_pages->remove_if_exists(b->page.id().page_no()) &&
m_freed_pages->empty()) m_freed_pages->empty())
{ {