Merge lp:~akopytov/percona-server/bug1000221-5.1 into lp:percona-server/5.1

[Alexey Kopytov]

[Alexey Kopytov (akopytov)]

http://jenkins.percona.com/view/PS%205.1/job/percona-server-5.1-param/324/

[Alexey Kopytov (akopytov)]

issue #21353.

[Laurynas Biveinis (laurynas-biveinis)]

review: Approve

=== modified file 'Percona-Server/storage/innodb_plugin/fil/fil0fil.c'
--- Percona-Server/storage/innodb_plugin/fil/fil0fil.c	2012-05-09 04:14:12 +0000
+++ Percona-Server/storage/innodb_plugin/fil/fil0fil.c	2012-06-01 14:48:37 +0000
@@ -3375,6 +3375,7 @@
 			for (offset = 0; offset < free_limit_bytes;
 			     offset += zip_size ? zip_size : UNIV_PAGE_SIZE) {
 				ibool		page_is_corrupt;
+				ibool		is_descr_page = FALSE;
 
 				success = os_file_read(file, page,
 							(ulint)(offset & 0xFFFFFFFFUL),
@@ -3413,6 +3414,7 @@
 
 					/* store as descr page */
 					memcpy(descr_page, page, (zip_size ? zip_size : UNIV_PAGE_SIZE));
+					is_descr_page = TRUE;
 
 				} else if (descr_is_corrupt) {
 					/* unknown state of the page */
@@ -3489,7 +3491,8 @@
 						}
 					}
 
-					if (fil_page_get_type(page) == FIL_PAGE_INDEX) {
+					if (fil_page_get_type(page) ==
+					    FIL_PAGE_INDEX && !is_descr_page) {
 						dulint tmp = mach_read_from_8(page + (PAGE_HEADER + PAGE_INDEX_ID));
 
 						for (i = 0; i < n_index; i++) {