Merge lp:~percona-dev/percona-server/release-5.1.49-12-fix_bug569275 into lp:percona-server/release-5.1.49-12

[Yasufumi Kinoshita]

=== modified file 'innodb_buffer_pool_shm.patch'
--- innodb_buffer_pool_shm.patch	2010-07-26 16:29:05 +0000
+++ innodb_buffer_pool_shm.patch	2010-07-29 11:08:43 +0000
@@ -382,7 +382,7 @@
  
  	return(chunk);
  }
-@@ -1009,6 +1319,8 @@
+@@ -1014,6 +1324,8 @@
  		UNIV_MEM_UNDESC(block);
  	}
  
@@ -391,7 +391,7 @@
  	os_mem_free_large(chunk->mem, chunk->mem_size);
  }
  
-@@ -1058,7 +1370,10 @@
+@@ -1063,7 +1375,10 @@
  	srv_buf_pool_curr_size = buf_pool->curr_size * UNIV_PAGE_SIZE;
  
  	buf_pool->page_hash = hash_create(2 * buf_pool->curr_size);
@@ -402,7 +402,7 @@
  
  	buf_pool->last_printout_time = time(NULL);
  
-@@ -1073,6 +1388,86 @@
+@@ -1078,6 +1393,86 @@
  	--------------------------- */
  	/* All fields are initialized by mem_zalloc(). */
  
@@ -489,7 +489,7 @@
  	mutex_exit(&LRU_list_mutex);
  	rw_lock_x_unlock(&page_hash_latch);
  	buf_pool_mutex_exit();
-@@ -1097,6 +1492,30 @@
+@@ -1102,6 +1497,30 @@
  	buf_chunk_t*	chunk;
  	buf_chunk_t*	chunks;
  
@@ -520,7 +520,7 @@
  	chunks = buf_pool->chunks;
  	chunk = chunks + buf_pool->n_chunks;
  
-@@ -1105,10 +1524,13 @@
+@@ -1110,10 +1529,13 @@
  		would fail at shutdown. */
  		os_mem_free_large(chunk->mem, chunk->mem_size);
  	}
@@ -534,7 +534,7 @@
  	mem_free(buf_pool);
  	buf_pool = NULL;
  }
-@@ -1303,6 +1725,11 @@
+@@ -1308,6 +1730,11 @@
  	//buf_pool_mutex_enter();
  	mutex_enter(&LRU_list_mutex);
  
@@ -546,7 +546,7 @@
  shrink_again:
  	if (buf_pool->n_chunks <= 1) {
  
-@@ -1546,6 +1973,11 @@
+@@ -1551,6 +1978,11 @@
  buf_pool_resize(void)
  /*=================*/
  {

=== modified file 'innodb_pass_corrupt_table.patch'
--- innodb_pass_corrupt_table.patch	2010-07-26 16:29:05 +0000
+++ innodb_pass_corrupt_table.patch	2010-07-29 11:08:43 +0000
@@ -321,7 +321,19 @@
  
  /* prototypes for new functions added to ha_innodb.cc */
  trx_t* innobase_get_trx();
-@@ -1803,6 +1804,14 @@
+@@ -895,6 +896,11 @@
+ 			ready = buf_flush_ready_for_replace(&block->page);
+ 			mutex_exit(&block->mutex);
+ 
++			if (block->page.is_corrupt) {
++				/* corrupt page may remain, it can be skipped */
++				break;
++			}
++
+ 			if (!ready) {
+ 
+ 				return(block);
+@@ -1803,6 +1809,14 @@
  		return(NULL);
  	}
  
@@ -336,7 +348,7 @@
  	block_mutex = buf_page_get_mutex_enter(bpage);
  
  	rw_lock_s_unlock(&page_hash_latch);
-@@ -2264,6 +2273,14 @@
+@@ -2264,6 +2278,14 @@
  		return(NULL);
  	}
  
@@ -351,7 +363,7 @@
  	switch (buf_block_get_state(block)) {
  		buf_page_t*	bpage;
  		ibool		success;
-@@ -2885,6 +2902,7 @@
+@@ -2885,6 +2907,7 @@
  	bpage->newest_modification = 0;
  	bpage->oldest_modification = 0;
  	HASH_INVALIDATE(bpage, hash);
@@ -359,7 +371,7 @@
  #ifdef UNIV_DEBUG_FILE_ACCESSES
  	bpage->file_page_was_freed = FALSE;
  #endif /* UNIV_DEBUG_FILE_ACCESSES */
-@@ -3341,7 +3359,8 @@
+@@ -3341,7 +3364,8 @@
  void
  buf_page_io_complete(
  /*=================*/
@@ -369,7 +381,7 @@
  {
  	enum buf_io_fix	io_type;
  	const ibool	uncompressed = (buf_page_get_state(bpage)
-@@ -3419,6 +3438,7 @@
+@@ -3419,6 +3443,7 @@
  				(ulong) bpage->offset);
  		}
  
@@ -377,7 +389,7 @@
  		/* From version 3.23.38 up we store the page checksum
  		to the 4 first bytes of the page end lsn field */
  
-@@ -3460,6 +3480,19 @@
+@@ -3460,6 +3485,19 @@
  			      REFMAN "forcing-recovery.html\n"
  			      "InnoDB: about forcing recovery.\n", stderr);
  
@@ -397,7 +409,7 @@
  			if (srv_force_recovery < SRV_FORCE_IGNORE_CORRUPT) {
  				fputs("InnoDB: Ending processing because of"
  				      " a corrupt database page.\n",
-@@ -3467,6 +3500,7 @@
+@@ -3467,6 +3505,7 @@
  				exit(1);
  			}
  		}
@@ -405,7 +417,7 @@
  
  		if (recv_recovery_is_on()) {
  			/* Pages must be uncompressed for crash recovery. */
-@@ -3476,8 +3510,11 @@
+@@ -3476,8 +3515,11 @@
  
  		if (uncompressed && !recv_no_ibuf_operations) {
  			ibuf_merge_or_delete_for_page(