diff --git a/storage/innobase/buf/buf0buf.cc b/storage/innobase/buf/buf0buf.cc
index 7263b8ce669be..0730683a2d334 100644
--- a/storage/innobase/buf/buf0buf.cc
+++ b/storage/innobase/buf/buf0buf.cc
@@ -4513,7 +4513,7 @@ buf_page_check_corrupt(
 		ib_logf(IB_LOG_LEVEL_ERROR,
 			"%s: Block in space_id " ULINTPF " in file %s corrupted.",
 			page_type ==  FIL_PAGE_PAGE_COMPRESSED_ENCRYPTED ? "Maybe corruption" : "Corruption",
-			space_id, space ? space->name : "NULL");
+			space_id, space->name ? space->name : "NULL");
 		ib_logf(IB_LOG_LEVEL_ERROR,
 			"Based on page type %s (" ULINTPF ")",
 			fil_get_page_type_name(page_type), page_type);
@@ -4523,7 +4523,7 @@ buf_page_check_corrupt(
 
 		ib_logf(IB_LOG_LEVEL_ERROR,
 			"Block in space_id " ULINTPF " in file %s encrypted.",
-			space_id, space ? space->name : "NULL");
+			space_id, space->name ? space->name : "NULL");
 		ib_logf(IB_LOG_LEVEL_ERROR,
 				"However key management plugin or used key_version %u is not found or"
 				" used encryption algorithm or method does not match.",
@@ -4669,7 +4669,7 @@ buf_page_io_complete(
 				ib_logf(IB_LOG_LEVEL_ERROR,
 					"Space %u file %s read of page %u.",
 					bpage->space,
-					space ? space->name : "NULL",
+					space->name ? space->name : "NULL",
 					bpage->offset);
 				ib_logf(IB_LOG_LEVEL_ERROR,
 					"You may have to recover"
@@ -4894,7 +4894,7 @@ buf_all_freed_instance(
 				ib_logf(IB_LOG_LEVEL_ERROR,
 					"Page space_id %u name %s.",
 					block->page.space,
-					(space && space->name) ? space->name : "NULL");
+					space->name ? space->name : "NULL");
 				ut_error;
 			}
 		}
diff --git a/storage/innobase/buf/buf0dblwr.cc b/storage/innobase/buf/buf0dblwr.cc
index 75a85de431366..2e0cbc1a8b2a2 100644
--- a/storage/innobase/buf/buf0dblwr.cc
+++ b/storage/innobase/buf/buf0dblwr.cc
@@ -489,7 +489,6 @@ buf_dblwr_process()
 
 	for (std::list<byte*>::iterator i = recv_dblwr.pages.begin();
 	     i != recv_dblwr.pages.end(); ++i, ++page_no_dblwr ) {
-		fil_space_t* space=NULL;
 		page = *i;
 		page_no  = mach_read_from_4(page + FIL_PAGE_OFFSET);
 		space_id = mach_read_from_4(page + FIL_PAGE_SPACE_ID);
@@ -509,7 +508,7 @@ buf_dblwr_process()
 			continue;
 		}
 
-		space = fil_space_found_by_id(space_id);
+		fil_space_t* space = fil_space_found_by_id(space_id);
 		ulint	zip_size = fil_space_get_zip_size(space_id);
 		ut_ad(!buf_page_is_zeroes(page, zip_size));
 
diff --git a/storage/xtradb/buf/buf0buf.cc b/storage/xtradb/buf/buf0buf.cc
index 4ed7dab052bc2..496cf63d93952 100644
--- a/storage/xtradb/buf/buf0buf.cc
+++ b/storage/xtradb/buf/buf0buf.cc
@@ -4614,7 +4614,7 @@ buf_page_check_corrupt(
 		ib_logf(IB_LOG_LEVEL_ERROR,
 			"%s: Block in space_id " ULINTPF " in file %s corrupted.",
 			page_type ==  FIL_PAGE_PAGE_COMPRESSED_ENCRYPTED ? "Maybe corruption" : "Corruption",
-			space_id, space ? space->name : "NULL");
+			space_id, space->name ? space->name : "NULL");
 		ib_logf(IB_LOG_LEVEL_ERROR,
 			"Based on page type %s (" ULINTPF ")",
 			fil_get_page_type_name(page_type), page_type);
@@ -4624,7 +4624,7 @@ buf_page_check_corrupt(
 
 		ib_logf(IB_LOG_LEVEL_ERROR,
 			"Block in space_id " ULINTPF " in file %s encrypted.",
-			space_id, space ? space->name : "NULL");
+			space_id, space->name ? space->name : "NULL");
 		ib_logf(IB_LOG_LEVEL_ERROR,
 				"However key management plugin or used key_version %u is not found or"
 				" used encryption algorithm or method does not match.",
@@ -4775,7 +4775,7 @@ buf_page_io_complete(
 				ib_logf(IB_LOG_LEVEL_ERROR,
 					"Space %u file %s read of page %u.",
 					bpage->space,
-					space ? space->name : "NULL",
+					space->name ? space->name : "NULL",
 					bpage->offset);
 				ib_logf(IB_LOG_LEVEL_ERROR,
 					"You may have to recover"
@@ -5040,7 +5040,7 @@ buf_all_freed_instance(
 				ib_logf(IB_LOG_LEVEL_ERROR,
 					"Page space_id %u name %s.",
 					block->page.space,
-					(space && space->name) ? space->name : "NULL");
+					space->name ? space->name : "NULL");
 				ut_error;
 			}
 		}
diff --git a/storage/xtradb/buf/buf0dblwr.cc b/storage/xtradb/buf/buf0dblwr.cc
index 5a49ccd571fd5..b11c32064bf02 100644
--- a/storage/xtradb/buf/buf0dblwr.cc
+++ b/storage/xtradb/buf/buf0dblwr.cc
@@ -489,7 +489,6 @@ buf_dblwr_process()
 
 	for (std::list<byte*>::iterator i = recv_dblwr.pages.begin();
 	     i != recv_dblwr.pages.end(); ++i, ++page_no_dblwr ) {
-		fil_space_t* space=NULL;
 		page = *i;
 		page_no  = mach_read_from_4(page + FIL_PAGE_OFFSET);
 		space_id = mach_read_from_4(page + FIL_PAGE_SPACE_ID);
@@ -509,7 +508,7 @@ buf_dblwr_process()
 			continue;
 		}
 
-		space = fil_space_found_by_id(space_id);
+		fil_space_t* space = fil_space_found_by_id(space_id);
 		ulint	zip_size = fil_space_get_zip_size(space_id);
 		ut_ad(!buf_page_is_zeroes(page, zip_size));