Merge 10.3 into 10.4

MariaDB · Oct 12, 2019 · 899c843 · 899c843
2 parents 0a473de + fa6c606
commit 899c843
Showing 1 changed file with 3 additions and 1 deletion.
diff --git 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;