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
690fcfbd
Commit
690fcfbd
authored
Jan 18, 2023
by
Andrew Hutchings
Committed by
Andrew Hutchings
Feb 14, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix S3 engine Coverity hits
Very minor hits found by Coverity for the S3 engine.
parent
1a5c7552
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
storage/maria/ha_s3.cc
storage/maria/ha_s3.cc
+1
-1
storage/maria/s3_func.c
storage/maria/s3_func.c
+3
-3
No files found.
storage/maria/ha_s3.cc
View file @
690fcfbd
...
...
@@ -233,7 +233,7 @@ ha_create_table_option s3_table_option_list[]=
ha_s3
::
ha_s3
(
handlerton
*
hton
,
TABLE_SHARE
*
table_arg
)
:
ha_maria
(
hton
,
table_arg
),
in_alter_table
(
S3_NO_ALTER
)
:
ha_maria
(
hton
,
table_arg
),
in_alter_table
(
S3_NO_ALTER
)
,
open_args
(
NULL
)
{
/* Remove things that S3 doesn't support */
int_table_flags
&=
~
(
HA_BINLOG_ROW_CAPABLE
|
HA_BINLOG_STMT_CAPABLE
|
...
...
storage/maria/s3_func.c
View file @
690fcfbd
...
...
@@ -351,7 +351,7 @@ int aria_copy_to_s3(ms3_st *s3_client, const char *aws_bucket,
if
(
display
)
printf
(
"Copying frm file %s
\n
"
,
filename
);
end
=
strmov
(
aws_path_end
,
"/frm"
);
strmov
(
aws_path_end
,
"/frm"
);
convert_frm_to_s3_format
(
alloc_block
);
/* Note that frm is not compressed! */
...
...
@@ -1232,7 +1232,7 @@ static void convert_index_to_s3_format(uchar *header, ulong block_size,
uchar
*
base_pos
;
uint
base_offset
;
memcpy
(
state
.
header
.
file_version
,
header
,
sizeof
(
state
.
header
));
memcpy
(
&
state
.
header
,
header
,
sizeof
(
state
.
header
));
base_offset
=
mi_uint2korr
(
state
.
header
.
base_pos
);
base_pos
=
header
+
base_offset
;
...
...
@@ -1251,7 +1251,7 @@ static void convert_index_to_disk_format(uchar *header)
uchar
*
base_pos
;
uint
base_offset
;
memcpy
(
state
.
header
.
file_version
,
header
,
sizeof
(
state
.
header
));
memcpy
(
&
state
.
header
,
header
,
sizeof
(
state
.
header
));
base_offset
=
mi_uint2korr
(
state
.
header
.
base_pos
);
base_pos
=
header
+
base_offset
;
...
...
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