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
4b28798f
Commit
4b28798f
authored
Jan 25, 2017
by
Jan Lindström
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix compiler error on x86.
parent
17430a80
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
6 deletions
+9
-6
storage/innobase/include/os0file.h
storage/innobase/include/os0file.h
+1
-1
storage/innobase/os/os0file.cc
storage/innobase/os/os0file.cc
+8
-5
No files found.
storage/innobase/include/os0file.h
View file @
4b28798f
...
...
@@ -434,7 +434,7 @@ class IORequest {
dberr_t
punch_hole
(
os_file_t
fh
,
os_offset_t
offset
,
ulint
len
);
os_offset_t
len
);
private:
/** Page to be written on write operation. */
...
...
storage/innobase/os/os0file.cc
View file @
4b28798f
...
...
@@ -1887,7 +1887,10 @@ LinuxAIOHandler::collect()
&&
slot
->
type
.
is_write
()
&&
slot
->
type
.
punch_hole
())
{
slot
->
err
=
slot
->
type
.
punch_hole
(
slot
->
file
,
slot
->
offset
,
slot
->
len
);
slot
->
err
=
slot
->
type
.
punch_hole
(
slot
->
file
,
slot
->
offset
,
static_cast
<
os_offset_t
>
(
slot
->
len
));
}
else
{
slot
->
err
=
DB_SUCCESS
;
}
...
...
@@ -4825,8 +4828,8 @@ os_file_io(
&&
type
.
is_write
()
&&
type
.
punch_hole
())
{
*
err
=
type
.
punch_hole
(
file
,
static_cast
<
ulint
>
(
offset
)
,
n
);
offset
,
static_cast
<
os_offset_t
>
(
n
)
);
}
else
{
*
err
=
DB_SUCCESS
;
...
...
@@ -5494,7 +5497,7 @@ IORequest::punch_hole(
return
(
DB_SUCCESS
);
);
ulint
trim_len
=
get_trim_length
(
len
);
os_offset_t
trim_len
=
static_cast
<
os_offset_t
>
(
get_trim_length
(
len
)
);
if
(
trim_len
==
0
)
{
return
(
DB_SUCCESS
);
...
...
@@ -5508,7 +5511,7 @@ IORequest::punch_hole(
return
DB_IO_NO_PUNCH_HOLE
;
}
dberr_t
err
=
os_file_punch_hole
(
fh
,
off
,
len
);
dberr_t
err
=
os_file_punch_hole
(
fh
,
off
,
trim_
len
);
if
(
err
==
DB_SUCCESS
)
{
srv_stats
.
page_compressed_trim_op
.
inc
();
...
...
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