bzr push into mysql-trunk-wl5854 branch (marko.makela:3763 to 3764)

[marko.makela]

 3764 Marko Mäkelä	2012-05-07
      Add debug assertions on B-tree page type when opening btr_cur.

    modified:
      storage/innobase/btr/btr0cur.cc
 3763 Marko Mäkelä	2012-05-07
      Assert that modified B-tree pages carry page type FIL_PAGE_INDEX.
      Assert that PAGE_INDEX_ID of modified B-tree pages matches index->id,
      except when merging buffered changes or applying the redo log.

    modified:
      storage/innobase/btr/btr0cur.cc
      storage/innobase/page/page0cur.cc
      storage/innobase/row/row0sel.cc
=== modified file 'storage/innobase/btr/btr0cur.cc'
--- a/storage/innobase/btr/btr0cur.cc	revid:marko.makela@strippedk
+++ b/storage/innobase/btr/btr0cur.cc	revid:marko.makela@stripped
@@ -713,6 +713,7 @@ retry_page_get:
 			? SYNC_IBUF_TREE_NODE : SYNC_TREE_NODE);
 	}
 
+	ut_ad(fil_page_get_type(page) == FIL_PAGE_INDEX);
 	ut_ad(index->id == btr_page_get_index_id(page));
 
 	if (UNIV_UNLIKELY(height == ULINT_UNDEFINED)) {
@@ -911,6 +912,7 @@ btr_cur_open_at_index_side_func(
 					 RW_NO_LATCH, NULL, BUF_GET,
 					 file, line, mtr);
 		page = buf_block_get_frame(block);
+		ut_ad(fil_page_get_type(page) == FIL_PAGE_INDEX);
 		ut_ad(index->id == btr_page_get_index_id(page));
 
 		block->check_index_page_at_flush = TRUE;
@@ -1040,6 +1042,7 @@ btr_cur_open_at_rnd_pos_func(
 					 RW_NO_LATCH, NULL, BUF_GET,
 					 file, line, mtr);
 		page = buf_block_get_frame(block);
+		ut_ad(fil_page_get_type(page) == FIL_PAGE_INDEX);
 		ut_ad(index->id == btr_page_get_index_id(page));
 
 		if (height == ULINT_UNDEFINED) {

No bundle (reason: useless for push emails).