1 files changed, 5 insertions, 74 deletions

diff --git a/storage/innobase/include/buf0flu.ic b/storage/innobase/include/buf0flu.ic
index 8d06a53c547..02f3d8ced57 100644
--- a/storage/innobase/include/buf0flu.ic
+++ b/storage/innobase/include/buf0flu.ic
@@ -38,17 +38,6 @@ buf_flush_insert_into_flush_list(
 	lsn_t		lsn);		/*!< in: oldest modification */
 
 /********************************************************************//**
-Inserts a modified block into the flush list in the right sorted position.
-This function is used by recovery, because there the modifications do not
-necessarily come in the order of lsn's. */
-void
-buf_flush_insert_sorted_into_flush_list(
-/*====================================*/
-	buf_pool_t*	buf_pool,	/*!< buffer pool instance */
-	buf_block_t*	block,		/*!< in/out: block which is modified */
-	lsn_t		lsn);		/*!< in: oldest modification */
-
-/********************************************************************//**
 This function should be called at a mini-transaction commit, if a page was
 modified in it. Puts the block to the list of modified blocks, if it is not
 already in it. */
@@ -63,24 +52,11 @@ buf_flush_note_modification(
 					modified this block */
 	FlushObserver*	observer)	/*!< in: flush observer */
 {
-#ifdef UNIV_DEBUG
-	{
-		/* Allow write to proceed to shared temporary tablespace
-		in read-only mode. */
-		ut_ad(!srv_read_only_mode
-		      || fsp_is_system_temporary(block->page.id.space()));
-		ut_ad(buf_block_get_state(block) == BUF_BLOCK_FILE_PAGE);
-		ut_ad(block->page.buf_fix_count > 0);
-
-		buf_pool_t*	buf_pool = buf_pool_from_block(block);
-
-		ut_ad(!buf_pool_mutex_own(buf_pool));
-		ut_ad(!buf_flush_list_mutex_own(buf_pool));
-	}
-#endif /* UNIV_DEBUG */
-
 	mutex_enter(&block->mutex);
-
+	ut_ad(!srv_read_only_mode
+	      || fsp_is_system_temporary(block->page.id.space()));
+	ut_ad(buf_block_get_state(block) == BUF_BLOCK_FILE_PAGE);
+	ut_ad(block->page.buf_fix_count > 0);
 	ut_ad(block->page.newest_modification <= end_lsn);
 	block->page.newest_modification = end_lsn;
 
@@ -98,52 +74,7 @@ buf_flush_note_modification(
 		ut_ad(block->page.oldest_modification <= start_lsn);
 	}
 
-	buf_page_mutex_exit(block);
+	mutex_exit(&block->mutex);
 
 	srv_stats.buf_pool_write_requests.inc();
 }
-
-/********************************************************************//**
-This function should be called when recovery has modified a buffer page. */
-UNIV_INLINE
-void
-buf_flush_recv_note_modification(
-/*=============================*/
-	buf_block_t*	block,		/*!< in: block which is modified */
-	lsn_t		start_lsn,	/*!< in: start lsn of the first mtr in a
-					set of mtr's */
-	lsn_t		end_lsn)	/*!< in: end lsn of the last mtr in the
-					set of mtr's */
-{
-#ifdef UNIV_DEBUG
-	{
-		ut_ad(!srv_read_only_mode);
-		ut_ad(buf_block_get_state(block) == BUF_BLOCK_FILE_PAGE);
-		ut_ad(block->page.buf_fix_count > 0);
-
-		buf_pool_t*	buf_pool = buf_pool_from_block(block);
-
-		ut_ad(!buf_pool_mutex_own(buf_pool));
-		ut_ad(!buf_flush_list_mutex_own(buf_pool));
-
-		ut_ad(start_lsn != 0);
-		ut_ad(block->page.newest_modification <= end_lsn);
-	}
-#endif /* UNIV_DEBUG */
-
-	buf_page_mutex_enter(block);
-
-	block->page.newest_modification = end_lsn;
-
-	if (!block->page.oldest_modification) {
-		buf_pool_t*	buf_pool = buf_pool_from_block(block);
-
-		buf_flush_insert_sorted_into_flush_list(
-			buf_pool, block, start_lsn);
-	} else {
-		ut_ad(block->page.oldest_modification <= start_lsn);
-	}
-
-	buf_page_mutex_exit(block);
-
-}