[Commits] 428e09a: Fix buildbot failure seen on p8-rhel71.

Jan Lindström jan.lindstrom at mariadb.com
Fri Dec 18 11:25:49 EET 2015


revision-id: 428e09a789a17211de9b4f0a2c4c1226d5dcf993 (mariadb-10.1.9-23-g428e09a)
parent(s): 206039b8baf8d58478afc774578276d733eca58a
committer: Jan Lindström
timestamp: 2015-12-18 11:22:58 +0200
message:

Fix buildbot failure seen on p8-rhel71.

Currently we support file block sizes 512K-4K.

---
 storage/innobase/os/os0file.cc | 12 +++---------
 storage/xtradb/os/os0file.cc   | 12 +++---------
 2 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/storage/innobase/os/os0file.cc b/storage/innobase/os/os0file.cc
index 5f9443e..2b9e877 100644
--- a/storage/innobase/os/os0file.cc
+++ b/storage/innobase/os/os0file.cc
@@ -6415,19 +6415,13 @@ os_file_get_block_size(
 	}
 #endif /* __WIN__*/
 
-	if (fblock_size > UNIV_PAGE_SIZE/2 || fblock_size < 512) {
-		fprintf(stderr, "InnoDB: Note: File system for file %s has "
-			"file block size %lu not supported for page_size %lu\n",
-			name, fblock_size, UNIV_PAGE_SIZE);
-
+	/* Currently we support file block size up to 4Kb */
+	if (fblock_size > 4096 || fblock_size < 512) {
 		if (fblock_size < 512) {
 			fblock_size = 512;
 		} else {
-			fblock_size = UNIV_PAGE_SIZE/2;
+			fblock_size = 4096;
 		}
-
-		fprintf(stderr, "InnoDB: Note: Using file block size %ld for file %s\n",
-			fblock_size, name);
 	}
 
 	return fblock_size;
diff --git a/storage/xtradb/os/os0file.cc b/storage/xtradb/os/os0file.cc
index 0db50d3..8c8199b 100644
--- a/storage/xtradb/os/os0file.cc
+++ b/storage/xtradb/os/os0file.cc
@@ -6511,19 +6511,13 @@ os_file_get_block_size(
 	}
 #endif /* __WIN__*/
 
-	if (fblock_size > UNIV_PAGE_SIZE/2 || fblock_size < 512) {
-		fprintf(stderr, "InnoDB: Note: File system for file %s has "
-			"file block size %lu not supported for page_size %lu\n",
-			name, fblock_size, UNIV_PAGE_SIZE);
-
+	/* Currently we support file block size up to 4Kb */
+	if (fblock_size > 4096 || fblock_size < 512) {
 		if (fblock_size < 512) {
 			fblock_size = 512;
 		} else {
-			fblock_size = UNIV_PAGE_SIZE/2;
+			fblock_size = 4096;
 		}
-
-		fprintf(stderr, "InnoDB: Note: Using file block size %ld for file %s\n",
-			fblock_size, name);
 	}
 
 	return fblock_size;


More information about the commits mailing list