1 files changed, 33 insertions, 16 deletions

diff --git a/innobase/include/row0row.ic b/innobase/include/row0row.ic
index 8e5121f5a96..85410beacf0 100644
--- a/innobase/include/row0row.ic
+++ b/innobase/include/row0row.ic
@@ -20,7 +20,8 @@ row_get_rec_sys_field(
 				/* out: value of the field */
 	ulint		type,	/* in: DATA_TRX_ID or DATA_ROLL_PTR */
 	rec_t*		rec,	/* in: record */
-	dict_index_t*	index);	/* in: clustered index */
+	dict_index_t*	index,	/* in: clustered index */
+	const ulint*	offsets);/* in: rec_get_offsets(rec, index) */
 /*************************************************************************
 Sets the trx id or roll ptr field in a clustered index record: this function
 is slower than the specialized inline functions. */
@@ -32,6 +33,7 @@ row_set_rec_sys_field(
 	ulint		type,	/* in: DATA_TRX_ID or DATA_ROLL_PTR */
 	rec_t*		rec,	/* in: record */
 	dict_index_t*	index,	/* in: clustered index */
+	const ulint*	offsets,/* in: rec_get_offsets(rec, index) */
 	dulint		val);	/* in: value to set */
 
 /*************************************************************************
@@ -42,18 +44,21 @@ row_get_rec_trx_id(
 /*===============*/
 				/* out: value of the field */
 	rec_t*		rec,	/* in: record */
-	dict_index_t*	index)	/* in: clustered index */
+	dict_index_t*	index,	/* in: clustered index */
+	const ulint*	offsets)/* in: rec_get_offsets(rec, index) */
 {
 	ulint	offset;
 
 	ut_ad(index->type & DICT_CLUSTERED);
+	ut_ad(rec_offs_validate(rec, index, offsets));
 
 	offset = index->trx_id_offset;
 	
 	if (offset) {
 		return(trx_read_trx_id(rec + offset));
 	} else {
-		return(row_get_rec_sys_field(DATA_TRX_ID, rec, index));
+		return(row_get_rec_sys_field(DATA_TRX_ID,
+				rec, index, offsets));
 	}
 }
 
@@ -65,18 +70,21 @@ row_get_rec_roll_ptr(
 /*=================*/
 				/* out: value of the field */
 	rec_t*		rec,	/* in: record */
-	dict_index_t*	index)	/* in: clustered index */
+	dict_index_t*	index,	/* in: clustered index */
+	const ulint*	offsets)/* in: rec_get_offsets(rec, index) */
 {
 	ulint	offset;
 
 	ut_ad(index->type & DICT_CLUSTERED);
+	ut_ad(rec_offs_validate(rec, index, offsets));
 
 	offset = index->trx_id_offset;
 	
 	if (offset) {
 		return(trx_read_roll_ptr(rec + offset + DATA_TRX_ID_LEN));
 	} else {
-		return(row_get_rec_sys_field(DATA_ROLL_PTR, rec, index));
+		return(row_get_rec_sys_field(DATA_ROLL_PTR,
+				rec, index, offsets));
 	}
 }
 
@@ -88,18 +96,21 @@ row_set_rec_trx_id(
 /*===============*/
 	rec_t*		rec,	/* in: record */
 	dict_index_t*	index,	/* in: clustered index */
+	const ulint*	offsets,/* in: rec_get_offsets(rec, index) */
 	dulint		trx_id)	/* in: value of the field */
 {
 	ulint	offset;
 
 	ut_ad(index->type & DICT_CLUSTERED);
+	ut_ad(rec_offs_validate(rec, index, offsets));
 
 	offset = index->trx_id_offset;
 	
 	if (offset) {
 		trx_write_trx_id(rec + offset, trx_id);
 	} else {
-		row_set_rec_sys_field(DATA_TRX_ID, rec, index, trx_id);
+		row_set_rec_sys_field(DATA_TRX_ID,
+				rec, index, offsets, trx_id);
 	}
 }
 
@@ -111,18 +122,21 @@ row_set_rec_roll_ptr(
 /*=================*/
 	rec_t*		rec,	/* in: record */
 	dict_index_t*	index,	/* in: clustered index */
+	const ulint*	offsets,/* in: rec_get_offsets(rec, index) */
 	dulint		roll_ptr)/* in: value of the field */
 {
 	ulint	offset;
 
 	ut_ad(index->type & DICT_CLUSTERED);
+	ut_ad(rec_offs_validate(rec, index, offsets));
 
 	offset = index->trx_id_offset;
 	
 	if (offset) {
 		trx_write_roll_ptr(rec + offset + DATA_TRX_ID_LEN, roll_ptr);
 	} else {
-	 	row_set_rec_sys_field(DATA_ROLL_PTR, rec, index, roll_ptr);
+	 	row_set_rec_sys_field(DATA_ROLL_PTR,
+				rec, index, offsets, roll_ptr);
 	}
 }
 
@@ -133,14 +147,15 @@ UNIV_INLINE
 void
 row_build_row_ref_fast(
 /*===================*/
-	dtuple_t*	ref,	/* in: typed data tuple where the reference
-				is built */
-	ulint*		map,	/* in: array of field numbers in rec telling
-				how ref should be built from the fields of
-				rec */
-	rec_t*		rec)	/* in: record in the index; must be preserved
-				while ref is used, as we do not copy field
-				values to heap */
+	dtuple_t*	ref,	/* in: typed data tuple where the
+				reference is built */
+	const ulint*	map,	/* in: array of field numbers in rec
+				telling how ref should be built from
+				the fields of rec */
+	rec_t*		rec,	/* in: record in the index; must be
+				preserved while ref is used, as we do
+				not copy field values to heap */
+	const ulint*	offsets)/* in: array returned by rec_get_offsets() */
 {
 	dfield_t*	dfield;
 	byte*		field;
@@ -149,6 +164,7 @@ row_build_row_ref_fast(
 	ulint		field_no;
 	ulint		i;
 	
+	ut_ad(rec_offs_validate(rec, NULL, offsets));
 	ref_len = dtuple_get_n_fields(ref);
 	
 	for (i = 0; i < ref_len; i++) {
@@ -158,7 +174,8 @@ row_build_row_ref_fast(
 
 		if (field_no != ULINT_UNDEFINED) {
 
-			field = rec_get_nth_field(rec, field_no, &len);
+			field = rec_get_nth_field(rec, offsets,
+						field_no, &len);
 			dfield_set_data(dfield, field, len);
 		}
 	}