branches/zip: Non-functional changes:

ibuf_get_volume_buffered(): Declare with static linkage.
This function is private to ibuf0ibuf.c.

btr_cur_pessimistic_delete(): Use the cached result of
btr_cur_get_index(cursor).

btr/btr0cur.c

@@ -2877,7 +2877,7 @@ btr_cur_pessimistic_delete(
 	}
 
 	if (UNIV_UNLIKELY(page_get_n_recs(page) < 2)
-	    && UNIV_UNLIKELY(dict_index_get_page(btr_cur_get_index(cursor))
+	    && UNIV_UNLIKELY(dict_index_get_page(index)
 			     != buf_block_get_page_no(block))) {
 
 		/* If there is only one record, drop the whole page in

ibuf/ibuf0ibuf.c

@@ -2380,7 +2380,7 @@ ibuf_contract_after_insert(
 /*************************************************************************
 Gets an upper limit for the combined size of entries buffered in the insert
 buffer for a given page. */
-UNIV_INTERN
+static
 ulint
 ibuf_get_volume_buffered(
 /*=====================*/