Merge 10.3 into 10.4

899c843f · Marko Mäkelä · 0a473de0 · fa6c6062 · 899c843f
Commit 899c843f authored Oct 12, 2019 by Marko Mäkelä
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

storage/innobase/rem/rem0rec.cc storage/innobase/rem/rem0rec.cc +3 -1

No files found.
--- a/storage/innobase/rem/rem0rec.cc
+++ b/storage/innobase/rem/rem0rec.cc
@@ -788,7 +788,9 @@ rec_init_offsets(
 		}

 		if (i < rec_offs_n_fields(offsets)) {
-			ut_ad(index->is_instant());
+			ut_ad(index->is_instant()
+			      || i + (index->id == DICT_INDEXES_ID)
+			      == rec_offs_n_fields(offsets));

 			offs = (rec_offs_base(offsets)[i] & REC_OFFS_MASK)
 				| REC_OFFS_DEFAULT;