Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
428e09a7
Commit
428e09a7
authored
Dec 18, 2015
by
Jan Lindström
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix buildbot failure seen on p8-rhel71.
Currently we support file block sizes 512K-4K.
parent
206039b8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
18 deletions
+6
-18
storage/innobase/os/os0file.cc
storage/innobase/os/os0file.cc
+3
-9
storage/xtradb/os/os0file.cc
storage/xtradb/os/os0file.cc
+3
-9
No files found.
storage/innobase/os/os0file.cc
View file @
428e09a7
...
@@ -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
;
...
...
storage/xtradb/os/os0file.cc
View file @
428e09a7
...
@@ -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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment