branches/zip: Fix some function comments.

include/row0merge.h

@@ -148,10 +148,10 @@ dict_index_t*
 row_merge_create_index(
 /*===================*/
 					/* out: index, or NULL on error */
-	trx_t*		trx,		/* in/out: trx (sets error_state) */
-	dict_table_t*	table,		/* in: the index is on this table */
-	const merge_index_def_t*	/* in: the index definition */
-			index_def);
+	trx_t*			trx,	/* in/out: trx (sets error_state) */
+	dict_table_t*		table,	/* in: the index is on this table */
+	const merge_index_def_t*index_def);
+					/* in: the index definition */
 /*************************************************************************
 Check if a transaction can use an index. */
 UNIV_INTERN

page/page0cur.c

@@ -50,14 +50,14 @@ a = 1103515245 (3^5 * 5 * 7 * 129749)
 c = 12345 (3 * 5 * 823)
 m = 18446744073709551616 (2^64)
 */
-#define LCG_a	1103515245
-#define LCG_c	12345
 static
 ib_uint64_t
 page_cur_lcg_prng()
 /*===============*/
 			/* out: number between 0 and 2^64-1 */
 {
+#define LCG_a	1103515245
+#define LCG_c	12345
 	static ib_uint64_t	lcg_current = 0;
 	static ibool		initialized = FALSE;
 

page/page0zip.c

@@ -3174,6 +3174,8 @@ page_zip_validate(
 #endif /* UNIV_ZIP_DEBUG */
 
 #ifdef UNIV_DEBUG
+/**************************************************************************
+Assert that the compressed and decompressed page headers match. */
 static
 ibool
 page_zip_header_cmp(

row/row0merge.c

@@ -2172,10 +2172,10 @@ dict_index_t*
 row_merge_create_index(
 /*===================*/
 					/* out: index, or NULL on error */
-	trx_t*		trx,		/* in/out: trx (sets error_state) */
-	dict_table_t*	table,		/* in: the index is on this table */
-	const merge_index_def_t*	/* in: the index definition */
-			index_def)
+	trx_t*			trx,	/* in/out: trx (sets error_state) */
+	dict_table_t*		table,	/* in: the index is on this table */
+	const merge_index_def_t*index_def)
+					/* in: the index definition */
 {
 	dict_index_t*	index;
 	ulint		err;