Browse Source

Fix buildbot failure seen on p8-rhel71.

Currently we support file block sizes 512K-4K.
pull/19/merge
Jan Lindström 10 years ago
parent
commit
428e09a789
  1. 12
      storage/innobase/os/os0file.cc
  2. 12
      storage/xtradb/os/os0file.cc

12
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;

12
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;

Loading…
Cancel
Save