summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2018-08-28 16:48:19 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2018-09-07 22:06:20 +0300
commit93ed717b3d0a3e911d891253c7b53e8553057da4 (patch)
treee9e49c3c3438048888d7cd2189c288fdae03c63e
parent9f6a0d291f663e2406943271bfe8282134d61ad5 (diff)
downloadmariadb-git-93ed717b3d0a3e911d891253c7b53e8553057da4.tar.gz
Relax debug assertions for undo tablespace recovery
-rw-r--r--storage/innobase/log/log0recv.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/storage/innobase/log/log0recv.cc b/storage/innobase/log/log0recv.cc
index 86c415599bb..2ea7575881e 100644
--- a/storage/innobase/log/log0recv.cc
+++ b/storage/innobase/log/log0recv.cc
@@ -1277,6 +1277,7 @@ parse_log:
redo log been written with something
older than InnoDB Plugin 1.0.4. */
ut_ad(offs == FIL_PAGE_TYPE
+ || srv_is_undo_tablespace(space_id)
|| offs == IBUF_TREE_SEG_HEADER
+ IBUF_HEADER + FSEG_HDR_OFFSET
|| offs == PAGE_BTR_IBUF_FREE_LIST
@@ -1302,6 +1303,7 @@ parse_log:
ut_ad(0
/* fil_crypt_rotate_page() writes this */
|| offs == FIL_PAGE_SPACE_ID
+ || srv_is_undo_tablespace(space_id)
|| offs == IBUF_TREE_SEG_HEADER
+ IBUF_HEADER + FSEG_HDR_SPACE
|| offs == IBUF_TREE_SEG_HEADER