branches/zip: Non-functional change:

page_zip_copy_recs(): Rename from page_zip_copy().
Update the function comment.

btr/btr0btr.c

@@ -1184,8 +1184,8 @@ btr_root_raise_and_insert(
 		ut_a(new_page_zip);
 
 		/* Copy the page byte for byte. */
-		page_zip_copy(new_page_zip, new_page,
-			      root_page_zip, root, index, mtr);
+		page_zip_copy_recs(new_page_zip, new_page,
+				   root_page_zip, root, index, mtr);
 	}
 
 	/* If this is a pessimistic insert which is actually done to
@@ -1949,8 +1949,8 @@ insert_right:
 			as appropriate.  Deleting will always succeed. */
 			ut_a(new_page_zip);
 
-			page_zip_copy(new_page_zip, new_page,
-				      page_zip, page, cursor->index, mtr);
+			page_zip_copy_recs(new_page_zip, new_page,
+					   page_zip, page, cursor->index, mtr);
 			page_delete_rec_list_end(move_limit - page + new_page,
 						 new_block, cursor->index,
 						 ULINT_UNDEFINED,
@@ -1976,8 +1976,8 @@ insert_right:
 			as appropriate.  Deleting will always succeed. */
 			ut_a(new_page_zip);
 
-			page_zip_copy(new_page_zip, new_page,
-				      page_zip, page, cursor->index, mtr);
+			page_zip_copy_recs(new_page_zip, new_page,
+					   page_zip, page, cursor->index, mtr);
 			page_delete_rec_list_start(move_limit - page
 						   + new_page, new_block,
 						   cursor->index, mtr);
@@ -2339,8 +2339,8 @@ btr_lift_page_up(
 		ut_a(page_zip);
 
 		/* Copy the page byte for byte. */
-		page_zip_copy(father_page_zip, father_page,
-			      page_zip, page, index, mtr);
+		page_zip_copy_recs(father_page_zip, father_page,
+				   page_zip, page, index, mtr);
 	}
 
 	lock_update_copy_and_discard(father_block, block);

include/page0zip.h

@@ -373,11 +373,13 @@ page_zip_reorganize(
 	mtr_t*		mtr)	/* in: mini-transaction */
 	__attribute__((nonnull));
 /**************************************************************************
-Copy a page byte for byte, except for the file page header and trailer. */
+Copy the records of a page byte for byte.  Do not copy the page header
+or trailer, except those B-tree header fields that are directly
+related to the storage of records. */
 UNIV_INTERN
 void
-page_zip_copy(
-/*==========*/
+page_zip_copy_recs(
+/*===============*/
 	page_zip_des_t*		page_zip,	/* out: copy of src_zip
 						(n_blobs, m_start, m_end,
 						m_nonempty, data[0..size-1]) */

page/page0zip.c

@@ -4286,11 +4286,13 @@ page_zip_reorganize(
 }
 
 /**************************************************************************
-Copy a page byte for byte, except for the file page header and trailer. */
+Copy the records of a page byte for byte.  Do not copy the page header
+or trailer, except those B-tree header fields that are directly
+related to the storage of records. */
 UNIV_INTERN
 void
-page_zip_copy(
-/*==========*/
+page_zip_copy_recs(
+/*===============*/
 	page_zip_des_t*		page_zip,	/* out: copy of src_zip
 						(n_blobs, m_start, m_end,
 						m_nonempty, data[0..size-1]) */