branches/innodb+: Merge revisions 2660:2676 from branches/zip.

ChangeLog

@@ -1,3 +1,10 @@
+2008-09-19	The InnoDB Team
+
+	* os/os0proc.c:
+	Fix a memory leak on Windows. The memory leak was due to wrong
+	parameters passed into VirtualFree() call. As the result, the
+	call fails with Windows error 87.
+
 2008-09-17	The InnoDB Team
 
 	* mysql-test/innodb.result, mysql-test/innodb-zip.result,

btr/btr0btr.c

@@ -121,10 +121,14 @@ btr_root_block_get(
 	ut_a((ibool)!!page_is_comp(buf_block_get_frame(block))
 	     == dict_table_is_comp(index->table));
 #ifdef UNIV_BTR_DEBUG
+	if (!dict_index_is_ibuf(index)) {
+		const page_t*	root = buf_block_get_frame(block);
+
 		ut_a(btr_root_fseg_validate(FIL_PAGE_DATA + PAGE_BTR_SEG_LEAF
-				    + buf_block_get_frame(block), space));
+					    + root, space));
 		ut_a(btr_root_fseg_validate(FIL_PAGE_DATA + PAGE_BTR_SEG_TOP
-				    + buf_block_get_frame(block), space));
+					    + root, space));
+	}
 #endif /* UNIV_BTR_DEBUG */
 
 	return(block);
@@ -1151,10 +1155,15 @@ btr_root_raise_and_insert(
 #endif /* UNIV_ZIP_DEBUG */
 	index = btr_cur_get_index(cursor);
 #ifdef UNIV_BTR_DEBUG
+	if (!dict_index_is_ibuf(index)) {
+		ulint	space = dict_index_get_space(index);
+
 		ut_a(btr_root_fseg_validate(FIL_PAGE_DATA + PAGE_BTR_SEG_LEAF
-				    + root, dict_index_get_space(index)));
+					    + root, space));
 		ut_a(btr_root_fseg_validate(FIL_PAGE_DATA + PAGE_BTR_SEG_TOP
-				    + root, dict_index_get_space(index)));
+					    + root, space));
+	}
+
 	ut_a(dict_index_get_page(index) == page_get_page_no(root));
 #endif /* UNIV_BTR_DEBUG */
 	ut_ad(mtr_memo_contains(mtr, dict_index_get_lock(index),
@@ -2703,12 +2712,18 @@ btr_discard_only_page_on_level(
 		/* The father is the root page */
 
 #ifdef UNIV_BTR_DEBUG
-		const page_t*	root = buf_block_get_frame(father_block);
-		const ulint	space = dict_index_get_space(index);
-		ut_a(btr_root_fseg_validate(FIL_PAGE_DATA + PAGE_BTR_SEG_LEAF
+		if (!dict_index_is_ibuf(index)) {
+			const page_t*	root
+				= buf_block_get_frame(father_block);
+			const ulint	space
+				= dict_index_get_space(index);
+			ut_a(btr_root_fseg_validate(
+				     FIL_PAGE_DATA + PAGE_BTR_SEG_LEAF
 				     + root, space));
-		ut_a(btr_root_fseg_validate(FIL_PAGE_DATA + PAGE_BTR_SEG_TOP
+			ut_a(btr_root_fseg_validate(
+				     FIL_PAGE_DATA + PAGE_BTR_SEG_TOP
 				     + root, space));
+		}
 #endif /* UNIV_BTR_DEBUG */
 		btr_page_empty(father_block, father_page_zip, mtr, index);
 

ibuf/ibuf0ibuf.c

@@ -3717,7 +3717,8 @@ ibuf_merge_or_delete_for_page(
 		page_zip = buf_block_get_page_zip(block);
 
 		if (UNIV_UNLIKELY(fil_page_get_type(block->frame)
-				  != FIL_PAGE_INDEX)) {
+				  != FIL_PAGE_INDEX)
+		    || UNIV_UNLIKELY(!page_is_leaf(block->frame))) {
 
 			page_t*	bitmap_page;
 
@@ -3746,7 +3747,7 @@ ibuf_merge_or_delete_for_page(
 				"InnoDB: buffer records to page n:o %lu"
 				" though the page\n"
 				"InnoDB: type is %lu, which is"
-				" not an index page!\n"
+				" not an index leaf page!\n"
 				"InnoDB: We try to resolve the problem"
 				" by skipping the insert buffer\n"
 				"InnoDB: merge for this page."

row/row0purge.c

@@ -207,7 +207,7 @@ row_purge_remove_sec_if_poss_low_nonbuffered(
 				/* out: TRUE if success or if not found */
 	purge_node_t*	node,	/* in: row purge node */
 	dict_index_t*	index,	/* in: index */
-	dtuple_t*	entry,	/* in: index entry */
+	const dtuple_t*	entry,	/* in: index entry */
 	ulint		mode)	/* in: latch mode BTR_MODIFY_LEAF or
 				BTR_MODIFY_TREE */
 {
@@ -288,7 +288,7 @@ row_purge_remove_sec_if_poss_low(
 				/* out: TRUE if success or if not found */
 	purge_node_t*	node,	/* in: row purge node */
 	dict_index_t*	index,	/* in: index */
-	dtuple_t*	entry,	/* in: index entry */
+	const dtuple_t*	entry,	/* in: index entry */
 	ulint		mode)	/* in: latch mode BTR_MODIFY_LEAF or
 				BTR_MODIFY_TREE */
 {