branches/zip: Clean up after r2129:

univ.i: Do not define UNIV_DEBUG, UNIV_ZIP_DEBUG.

btr_cur_del_unmark_for_ibuf(): Use the same comment in both btr0cur.c and
btr0cur.h.  Wrap long lines.

btr/btr0cur.c

@@ -2653,9 +2653,10 @@ used by the insert buffer insert merge mechanism. */
 void
 btr_cur_del_unmark_for_ibuf(
 /*========================*/
-	rec_t*		rec,		/* in: record to delete unmark */
-	page_zip_des_t*	page_zip,	/* in/out: compressed page corresponding
-					to rec, or NULL when the tablespace is
+	rec_t*		rec,		/* in/out: record to delete unmark */
+	page_zip_des_t*	page_zip,	/* in/out: compressed page
+					corresponding to rec, or NULL
+					when the tablespace is
 					uncompressed */
 	mtr_t*		mtr)		/* in: mtr */
 {

include/btr0cur.h

@@ -318,11 +318,12 @@ only used by the insert buffer insert merge mechanism. */
 void
 btr_cur_del_unmark_for_ibuf(
 /*========================*/
-	rec_t*		rec,	/* in: record to delete unmark */
-	page_zip_des_t*	pg_zip,	/* in/out: compressed page corresponding
-				to rec, or NULL when the tablespace is
-				uncompressed */
-	mtr_t*		mtr);	/* in: mtr */
+	rec_t*		rec,		/* in/out: record to delete unmark */
+	page_zip_des_t*	page_zip,	/* in/out: compressed page
+					corresponding to rec, or NULL
+					when the tablespace is
+					uncompressed */
+	mtr_t*		mtr);		/* in: mtr */
 /*****************************************************************
 Tries to compress a page of the tree if it seems useful. It is assumed
 that mtr holds an x-latch on the tree and on the cursor page. To avoid

include/univ.i

@@ -144,9 +144,6 @@ operations (very slow); also UNIV_DEBUG must be defined */
 						for compressed pages */
 #endif
 
-#define UNIV_DEBUG
-#define UNIV_ZIP_DEBUG
-
 #define UNIV_BTR_DEBUG				/* check B-tree links */
 #define UNIV_LIGHT_MEM_DEBUG			/* light memory debugging */