Merge 10.3 into 10.4

dr-m · dr-m · commit 899c843f11bc · 2019-10-12T22:03:31.000+03:00
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;

Original file line number	Diff line number	Diff line change
`@@ -788,7 +788,9 @@ rec_init_offsets(`
`788`	`788`	`}`
`789`	`789`
`790`	`790`	`if (i < rec_offs_n_fields(offsets)) {`
`791`		`- ut_ad(index->is_instant());`
	`791`	`+ ut_ad(index->is_instant()`
	`792`	`+ \|\| i + (index->id == DICT_INDEXES_ID)`
	`793`	`+ == rec_offs_n_fields(offsets));`
`792`	`794`
`793`	`795`	`offs = (rec_offs_base(offsets)[i] & REC_OFFS_MASK)`
`794`	`796`	`\| REC_OFFS_DEFAULT;`