summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2018-01-05 22:50:28 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2018-01-05 22:50:28 +0200
commit6feb74c4b21143ece69bcc1e04474a528f122cdb (patch)
tree1efda7448f384bb575853ac8ca29378166e9f79b
parent64ab0fb7214f81d0032201ed7f1f31179d4e7ce5 (diff)
downloadmariadb-git-6feb74c4b21143ece69bcc1e04474a528f122cdb.tar.gz
row_upd_rec_in_place(): Relax a debug assertion
-rw-r--r--storage/innobase/row/row0upd.cc12
1 files changed, 11 insertions, 1 deletions
diff --git a/storage/innobase/row/row0upd.cc b/storage/innobase/row/row0upd.cc
index 8e59fe7f113..c2ae828b1e0 100644
--- a/storage/innobase/row/row0upd.cc
+++ b/storage/innobase/row/row0upd.cc
@@ -714,9 +714,19 @@ row_upd_rec_in_place(
case REC_STATUS_COLUMNS_ADDED:
ut_ad(index->is_instant());
break;
+ case REC_STATUS_NODE_PTR:
+ if (recv_recovery_is_on()
+ && fil_page_get_type(page_align(rec))
+ == FIL_PAGE_RTREE) {
+ /* The function rtr_update_mbr_field_in_place()
+ is generating MLOG_COMP_REC_UPDATE_IN_PLACE
+ and MLOG_REC_UPDATE_IN_PLACE records for
+ node pointer pages. */
+ break;
+ }
+ /* fall through */
case REC_STATUS_INFIMUM:
case REC_STATUS_SUPREMUM:
- case REC_STATUS_NODE_PTR:
ut_ad(!"wrong record status in update");
}
#endif /* UNIV_DEBUG */