branches/zip: Add some const qualifiers to input parameters.

rec_get_converted_size_comp(), rec_convert_dtuple_to_rec_comp(),
rec_convert_dtuple_to_rec_new(), rec_convert_dtuple_to_rec(): Add a
const qualifier to dict_index_t*.

row_search_on_row_ref(): Add const qualifiers to the dict_table_t*
and dtuple_t* parameters.  Note that pcur is an "out" parameter
and mtr is "in/out".

include/rem0rec.h

@@ -621,10 +621,11 @@ 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			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 */
@@ -639,9 +640,10 @@ rec_convert_dtuple_to_rec(
 					of physical record */
 	byte*			buf,	/* in: start address of the
 					physical record */
-	dict_index_t*	index,	/* in: record descriptor */
+	const dict_index_t*	index,	/* in: record descriptor */
 	const dtuple_t*		dtuple,	/* in: data tuple */
-	ulint		n_ext);	/* in: number of externally stored columns */
+	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,9 +662,11 @@ 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 */
+					/* 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 */

include/row0row.h

@@ -218,12 +218,12 @@ ibool
 row_search_on_row_ref(
 /*==================*/
 					/* out: TRUE if found */
-	btr_pcur_t*	pcur,	/* in/out: persistent cursor, which must
+	btr_pcur_t*		pcur,	/* 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 */
+	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. */

rem/rem0rec.c

@@ -733,8 +733,10 @@ ulint
 rec_get_converted_size_comp(
 /*========================*/
 					/* out: total size */
-	dict_index_t*	index,	/* in: record descriptor;
-				dict_table_is_comp() is assumed to hold */
+	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 */
@@ -1001,10 +1003,11 @@ 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
+	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 */
+	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 */
@@ -1122,8 +1125,9 @@ 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 */
+	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;
@@ -1157,9 +1161,10 @@ rec_convert_dtuple_to_rec(
 					of physical record */
 	byte*			buf,	/* in: start address of the
 					physical record */
-	dict_index_t*	index,	/* in: record descriptor */
+	const dict_index_t*	index,	/* in: record descriptor */
 	const dtuple_t*		dtuple,	/* in: data tuple */
-	ulint		n_ext)	/* in: number of externally stored columns */
+	ulint			n_ext)	/* in: number of
+					externally stored columns */
 {
 	rec_t*	rec;
 

row/row0row.c

@@ -647,12 +647,12 @@ ibool
 row_search_on_row_ref(
 /*==================*/
 					/* out: TRUE if found */
-	btr_pcur_t*	pcur,	/* in/out: persistent cursor, which must
+	btr_pcur_t*		pcur,	/* 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 */
+	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;