bzr commit into mysql-trunk-innodb branch (jimmy.yang:3475) Bug#59876

[Jimmy Yang]

#At file:///home/jy/work2/mysql-trunk-innodb2/ based on revid:vasil.dimov@stripped

 3475 Jimmy Yang	2011-02-01
      Fix Bug #59876 Valgrind warning in i_s_innodb_set_page_type()

    modified:
      storage/innobase/handler/i_s.cc
=== modified file 'storage/innobase/handler/i_s.cc'
--- a/storage/innobase/handler/i_s.cc	revid:vasil.dimov@stripped
+++ b/storage/innobase/handler/i_s.cc	revid:jimmy.yang@stripped
@@ -3245,7 +3245,7 @@ i_s_innodb_buffer_page_get_info(
 	BUF_BLOCK_ZIP_DIRTY or BUF_BLOCK_FILE_PAGE */
 	if (buf_page_in_file(bpage)) {
 		const byte*	frame;
-		ulint		page_type;
+		ulint		page_type = I_S_PAGE_TYPE_UNKNOWN;
 
 		page_info->space_id = buf_page_get_space(bpage);
 
@@ -3283,19 +3283,6 @@ i_s_innodb_buffer_page_get_info(
 		page_type = fil_page_get_type(frame);
 
 		i_s_innodb_set_page_type(page_info, page_type, frame);
-
-	} else if (page_info->page_state == BUF_BLOCK_MEMORY) {
-		const byte*	frame;
-		const buf_block_t*block;
-		ulint		page_type;
-
-		block = reinterpret_cast<const buf_block_t*>(bpage);
-
-		frame = block->frame;
-
-		page_type = fil_page_get_type(frame);
-
-		i_s_innodb_set_page_type(page_info, page_type, frame);
 	} else {
 		page_info->page_type = I_S_PAGE_TYPE_UNKNOWN;
 	}


Attachment: [text/bzr-bundle] bzr/[e-mail]