Commit 428e09a7 authored by Jan Lindström's avatar Jan Lindström

Fix buildbot failure seen on p8-rhel71.

Currently we support file block sizes 512K-4K.
parent 206039b8
...@@ -6415,19 +6415,13 @@ os_file_get_block_size( ...@@ -6415,19 +6415,13 @@ os_file_get_block_size(
} }
#endif /* __WIN__*/ #endif /* __WIN__*/
if (fblock_size > UNIV_PAGE_SIZE/2 || fblock_size < 512) { /* Currently we support file block size up to 4Kb */
fprintf(stderr, "InnoDB: Note: File system for file %s has " if (fblock_size > 4096 || fblock_size < 512) {
"file block size %lu not supported for page_size %lu\n",
name, fblock_size, UNIV_PAGE_SIZE);
if (fblock_size < 512) { if (fblock_size < 512) {
fblock_size = 512; fblock_size = 512;
} else { } 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; return fblock_size;
......
...@@ -6511,19 +6511,13 @@ os_file_get_block_size( ...@@ -6511,19 +6511,13 @@ os_file_get_block_size(
} }
#endif /* __WIN__*/ #endif /* __WIN__*/
if (fblock_size > UNIV_PAGE_SIZE/2 || fblock_size < 512) { /* Currently we support file block size up to 4Kb */
fprintf(stderr, "InnoDB: Note: File system for file %s has " if (fblock_size > 4096 || fblock_size < 512) {
"file block size %lu not supported for page_size %lu\n",
name, fblock_size, UNIV_PAGE_SIZE);
if (fblock_size < 512) { if (fblock_size < 512) {
fblock_size = 512; fblock_size = 512;
} else { } 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; return fblock_size;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment