sync rev31 extensions

buf/buf0buddy.c

@@ -530,11 +530,18 @@ buf_buddy_relocate(
 		/* This must be a buf_page_t object. */
 		UNIV_MEM_ASSERT_RW(src, size);
 
+		if (have_page_hash_mutex)
+			mutex_exit(&page_hash_mutex);
+
 		mutex_exit(&zip_free_mutex);
 		if (buf_buddy_relocate_block(src, dst)) {
 
 			goto success;
 		}
+
+		if (have_page_hash_mutex)
+			mutex_enter(&page_hash_mutex);
+
 		mutex_enter(&zip_free_mutex);
 	}
 

buf/buf0rea.c

@@ -20,6 +20,7 @@ Created 11/5/1995 Heikki Tuuri
 #include "os0file.h"
 #include "srv0start.h"
 
+extern ulint srv_read_ahead;
 extern ulint srv_read_ahead_rnd;
 extern ulint srv_read_ahead_seq;
 extern ulint srv_buf_pool_reads;

include/buf0buf.ic

@@ -664,8 +664,10 @@ buf_frame_get_page_zip(
 {
 	const page_zip_des_t*	page_zip;
 	//buf_pool_mutex_enter();
+	mutex_enter(&page_hash_mutex);
 	page_zip = buf_block_get_page_zip(buf_block_align(ptr));
 	//buf_pool_mutex_exit();
+	mutex_exit(&page_hash_mutex);
 	return(page_zip);
 }
 #endif /* UNIV_DEBUG || UNIV_ZIP_DEBUG */

include/mtr0log.ic

@@ -192,9 +192,11 @@ mlog_write_initial_log_record_fast(
 
 #ifdef UNIV_DEBUG
 	//buf_pool_mutex_enter();
+	mutex_enter(&page_hash_mutex);
 	/* We now assume that all x-latched pages have been modified! */
 	block = (buf_block_t*) buf_block_align(ptr);
 	//buf_pool_mutex_exit();
+	mutex_exit(&page_hash_mutex);
 
 	if (!mtr_memo_contains(mtr, block, MTR_MEMO_MODIFY)) {
 

include/row0upd.ic

@@ -140,8 +140,10 @@ row_upd_rec_sys_fields(
 #ifdef UNIV_SYNC_DEBUG
 	if (!rw_lock_own(&btr_search_latch, RW_LOCK_EX)) {
 		//buf_pool_mutex_enter();
+		mutex_enter(&page_hash_mutex);
 		ut_ad(!buf_block_align(rec)->is_hashed);
 		//buf_pool_mutex_exit();
+		mutex_exit(&page_hash_mutex);
 	}
 #endif /* UNIV_SYNC_DEBUG */
 

mtr/mtr0mtr.c

@@ -315,8 +315,10 @@ mtr_memo_contains_page(
 	ibool	ret;
 
 	//buf_pool_mutex_enter();
+	mutex_enter(&page_hash_mutex);
 	ret = mtr_memo_contains(mtr, buf_block_align(ptr), type);
 	//buf_pool_mutex_exit();
+	mutex_exit(&page_hash_mutex);
 	return(ret);
 }