Merge 10.5 into 10.6

Author: dr-m

storage/innobase/buf/buf0flu.cc

@@ -941,10 +941,6 @@ static bool buf_flush_page(buf_page_t *bpage, bool lru, fil_space_t *space)
 #if defined HAVE_FALLOC_PUNCH_HOLE_AND_KEEP_SIZE || defined _WIN32
       if (size != orig_size && space->punch_hole)
         type= lru ? IORequest::PUNCH_LRU : IORequest::PUNCH;
-#else
-      DBUG_EXECUTE_IF("ignore_punch_hole",
-                      if (size != orig_size && space->punch_hole)
-                        type= lru ? IORequest::PUNCH_LRU : IORequest::PUNCH;);
 #endif
       frame=page;
     }

storage/innobase/os/os0file.cc

@@ -3541,13 +3541,6 @@ os_file_set_nocache(
 @return true if the file system supports sparse files */
 IF_WIN(static,) bool os_is_sparse_file_supported(os_file_t fh)
 {
-	/* In this debugging mode, we act as if punch hole is supported,
-	then we skip any calls to actually punch a hole.  In this way,
-	Transparent Page Compression is still being tested. */
-	DBUG_EXECUTE_IF("ignore_punch_hole",
-		return(true);
-	);
-
 #ifdef _WIN32
 	FILE_ATTRIBUTE_TAG_INFO info;
 	if (GetFileInformationByHandleEx(fh, FileAttributeTagInfo,
@@ -3798,13 +3791,6 @@ os_file_punch_hole(
 @return DB_SUCCESS or error code */
 dberr_t IORequest::punch_hole(os_offset_t off, ulint len) const
 {
-	/* In this debugging mode, we act as if punch hole is supported,
-	and then skip any calls to actually punch a hole here.
-	In this way, Transparent Page Compression is still being tested. */
-	DBUG_EXECUTE_IF("ignore_punch_hole",
-		return(DB_SUCCESS);
-	);
-
 	ulint trim_len = bpage ? bpage->physical_size() - len : 0;
 
 	if (trim_len == 0) {