diff --git a/include/rem0rec.h b/include/rem0rec.h
index 86bf3bd2078..7a87b82fd25 100644
--- a/include/rem0rec.h
+++ b/include/rem0rec.h
@@ -620,14 +620,15 @@ Builds a ROW_FORMAT=COMPACT record out of a data tuple. */
 void
 rec_convert_dtuple_to_rec_comp(
 /*===========================*/
-	rec_t*		rec,	/* in: origin of record */
-	ulint		extra,	/* in: number of bytes to reserve between
-				the record header and the data payload
-				(usually REC_N_NEW_EXTRA_BYTES) */
-	dict_index_t*	index,	/* in: record descriptor */
-	ulint		status,	/* in: status bits of the record */
-	const dfield_t*	fields,	/* in: array of data fields */
-	ulint		n_fields);/* in: number of data fields */
+	rec_t*			rec,	/* in: origin of record */
+	ulint			extra,	/* in: number of bytes to
+					reserve between the record
+					header and the data payload
+					(normally REC_N_NEW_EXTRA_BYTES) */
+	const dict_index_t*	index,	/* in: record descriptor */
+	ulint			status,	/* in: status bits of the record */
+	const dfield_t*		fields,	/* in: array of data fields */
+	ulint			n_fields);/* in: number of data fields */
 /*************************************************************
 Builds a physical record out of a data tuple and
 stores it into the given buffer. */
@@ -635,13 +636,14 @@ stores it into the given buffer. */
 rec_t*
 rec_convert_dtuple_to_rec(
 /*======================*/
-				/* out: pointer to the origin
-				of physical record */
-	byte*		buf,	/* in: start address of the
-				physical record */
-	dict_index_t*	index,	/* in: record descriptor */
-	const dtuple_t*	dtuple,	/* in: data tuple */
-	ulint		n_ext);	/* in: number of externally stored columns */
+					/* out: pointer to the origin
+					of physical record */
+	byte*			buf,	/* in: start address of the
+					physical record */
+	const dict_index_t*	index,	/* in: record descriptor */
+	const dtuple_t*		dtuple,	/* in: data tuple */
+	ulint			n_ext);	/* in: number of
+					externally stored columns */
 /**************************************************************
 Returns the extra size of an old-style physical record if we know its
 data size and number of fields. */
@@ -660,13 +662,15 @@ Determines the size of a data tuple in ROW_FORMAT=COMPACT. */
 ulint
 rec_get_converted_size_comp(
 /*========================*/
-				/* out: size */
-	dict_index_t*	index,	/* in: record descriptor;
-				dict_table_is_comp() is assumed to hold */
-	ulint		status,	/* in: status bits of the record */
-	const dfield_t*	fields,	/* in: array of data fields */
-	ulint		n_fields,/* in: number of data fields */
-	ulint*		extra);	/* out: extra size */
+					/* out: total size */
+	const dict_index_t*	index,	/* in: record descriptor;
+					dict_table_is_comp() is
+					assumed to hold, even if
+					it does not */
+	ulint			status,	/* in: status bits of the record */
+	const dfield_t*		fields,	/* in: array of data fields */
+	ulint			n_fields,/* in: number of data fields */
+	ulint*			extra);	/* out: extra size */
 /**************************************************************
 The following function returns the size of a data tuple when converted to
 a physical record. */
diff --git a/include/row0row.h b/include/row0row.h
index 8678aa8e109..d34691545c2 100644
--- a/include/row0row.h
+++ b/include/row0row.h
@@ -217,13 +217,13 @@ reference. */
 ibool
 row_search_on_row_ref(
 /*==================*/
-				/* out: TRUE if found */
-	btr_pcur_t*	pcur,	/* in/out: persistent cursor, which must
-				be closed by the caller */
-	ulint		mode,	/* in: BTR_MODIFY_LEAF, ... */
-	dict_table_t*	table,	/* in: table */
-	dtuple_t*	ref,	/* in: row reference */
-	mtr_t*		mtr);	/* in: mtr */
+					/* out: TRUE if found */
+	btr_pcur_t*		pcur,	/* out: persistent cursor, which must
+					be closed by the caller */
+	ulint			mode,	/* in: BTR_MODIFY_LEAF, ... */
+	const dict_table_t*	table,	/* in: table */
+	const dtuple_t*		ref,	/* in: row reference */
+	mtr_t*			mtr);	/* in/out: mtr */
 /*************************************************************************
 Fetches the clustered index record for a secondary index record. The latches
 on the secondary index record are preserved. */
diff --git a/rem/rem0rec.c b/rem/rem0rec.c
index 6a2cc58a01d..1a783719cbf 100644
--- a/rem/rem0rec.c
+++ b/rem/rem0rec.c
@@ -732,13 +732,15 @@ Determines the size of a data tuple in ROW_FORMAT=COMPACT. */
 ulint
 rec_get_converted_size_comp(
 /*========================*/
-				/* out: total size */
-	dict_index_t*	index,	/* in: record descriptor;
-				dict_table_is_comp() is assumed to hold */
-	ulint		status,	/* in: status bits of the record */
-	const dfield_t*	fields,	/* in: array of data fields */
-	ulint		n_fields,/* in: number of data fields */
-	ulint*		extra)	/* out: extra size */
+					/* out: total size */
+	const dict_index_t*	index,	/* in: record descriptor;
+					dict_table_is_comp() is
+					assumed to hold, even if
+					it does not */
+	ulint			status,	/* in: status bits of the record */
+	const dfield_t*		fields,	/* in: array of data fields */
+	ulint			n_fields,/* in: number of data fields */
+	ulint*			extra)	/* out: extra size */
 {
 	ulint		extra_size;
 	ulint		data_size;
@@ -1000,14 +1002,15 @@ Builds a ROW_FORMAT=COMPACT record out of a data tuple. */
 void
 rec_convert_dtuple_to_rec_comp(
 /*===========================*/
-	rec_t*		rec,	/* in: origin of record */
-	ulint		extra,	/* in: number of bytes to reserve between
-				the record header and the data payload
-				(normally REC_N_NEW_EXTRA_BYTES) */
-	dict_index_t*	index,	/* in: record descriptor */
-	ulint		status,	/* in: status bits of the record */
-	const dfield_t*	fields,	/* in: array of data fields */
-	ulint		n_fields)/* in: number of data fields */
+	rec_t*			rec,	/* in: origin of record */
+	ulint			extra,	/* in: number of bytes to
+					reserve between the record
+					header and the data payload
+					(normally REC_N_NEW_EXTRA_BYTES) */
+	const dict_index_t*	index,	/* in: record descriptor */
+	ulint			status,	/* in: status bits of the record */
+	const dfield_t*		fields,	/* in: array of data fields */
+	ulint			n_fields)/* in: number of data fields */
 {
 	const dfield_t*	field;
 	const dtype_t*	type;
@@ -1120,11 +1123,12 @@ static
 rec_t*
 rec_convert_dtuple_to_rec_new(
 /*==========================*/
-				/* out: pointer to the origin
-				of physical record */
-	byte*		buf,	/* in: start address of the physical record */
-	dict_index_t*	index,	/* in: record descriptor */
-	const dtuple_t*	dtuple)	/* in: data tuple */
+					/* out: pointer to the origin
+					of physical record */
+	byte*			buf,	/* in: start address of
+					the physical record */
+	const dict_index_t*	index,	/* in: record descriptor */
+	const dtuple_t*		dtuple)	/* in: data tuple */
 {
 	ulint	extra_size;
 	ulint	status;
@@ -1153,13 +1157,14 @@ stores it beginning from the start of the given buffer. */
 rec_t*
 rec_convert_dtuple_to_rec(
 /*======================*/
-				/* out: pointer to the origin
-				of physical record */
-	byte*		buf,	/* in: start address of the
-				physical record */
-	dict_index_t*	index,	/* in: record descriptor */
-	const dtuple_t*	dtuple,	/* in: data tuple */
-	ulint		n_ext)	/* in: number of externally stored columns */
+					/* out: pointer to the origin
+					of physical record */
+	byte*			buf,	/* in: start address of the
+					physical record */
+	const dict_index_t*	index,	/* in: record descriptor */
+	const dtuple_t*		dtuple,	/* in: data tuple */
+	ulint			n_ext)	/* in: number of
+					externally stored columns */
 {
 	rec_t*	rec;
 
diff --git a/row/row0row.c b/row/row0row.c
index 2acb581e819..2b2dd7294ec 100644
--- a/row/row0row.c
+++ b/row/row0row.c
@@ -646,13 +646,13 @@ Searches the clustered index record for a row, if we have the row reference. */
 ibool
 row_search_on_row_ref(
 /*==================*/
-				/* out: TRUE if found */
-	btr_pcur_t*	pcur,	/* in/out: persistent cursor, which must
-				be closed by the caller */
-	ulint		mode,	/* in: BTR_MODIFY_LEAF, ... */
-	dict_table_t*	table,	/* in: table */
-	dtuple_t*	ref,	/* in: row reference */
-	mtr_t*		mtr)	/* in: mtr */
+					/* out: TRUE if found */
+	btr_pcur_t*		pcur,	/* out: persistent cursor, which must
+					be closed by the caller */
+	ulint			mode,	/* in: BTR_MODIFY_LEAF, ... */
+	const dict_table_t*	table,	/* in: table */
+	const dtuple_t*		ref,	/* in: row reference */
+	mtr_t*			mtr)	/* in/out: mtr */
 {
 	ulint		low_match;
 	rec_t*		rec;