Skip to content

Commit 690fcfb

Browse files
committed
Fix S3 engine Coverity hits
Very minor hits found by Coverity for the S3 engine.
1 parent 1a5c755 commit 690fcfb

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

storage/maria/ha_s3.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ ha_create_table_option s3_table_option_list[]=
233233

234234

235235
ha_s3::ha_s3(handlerton *hton, TABLE_SHARE *table_arg)
236-
:ha_maria(hton, table_arg), in_alter_table(S3_NO_ALTER)
236+
:ha_maria(hton, table_arg), in_alter_table(S3_NO_ALTER), open_args(NULL)
237237
{
238238
/* Remove things that S3 doesn't support */
239239
int_table_flags&= ~(HA_BINLOG_ROW_CAPABLE | HA_BINLOG_STMT_CAPABLE |

storage/maria/s3_func.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ int aria_copy_to_s3(ms3_st *s3_client, const char *aws_bucket,
351351
if (display)
352352
printf("Copying frm file %s\n", filename);
353353

354-
end= strmov(aws_path_end,"/frm");
354+
strmov(aws_path_end,"/frm");
355355
convert_frm_to_s3_format(alloc_block);
356356

357357
/* Note that frm is not compressed! */
@@ -1232,7 +1232,7 @@ static void convert_index_to_s3_format(uchar *header, ulong block_size,
12321232
uchar *base_pos;
12331233
uint base_offset;
12341234

1235-
memcpy(state.header.file_version, header, sizeof(state.header));
1235+
memcpy(&state.header, header, sizeof(state.header));
12361236
base_offset= mi_uint2korr(state.header.base_pos);
12371237
base_pos= header + base_offset;
12381238

@@ -1251,7 +1251,7 @@ static void convert_index_to_disk_format(uchar *header)
12511251
uchar *base_pos;
12521252
uint base_offset;
12531253

1254-
memcpy(state.header.file_version, header, sizeof(state.header));
1254+
memcpy(&state.header, header, sizeof(state.header));
12551255
base_offset= mi_uint2korr(state.header.base_pos);
12561256
base_pos= header + base_offset;
12571257

0 commit comments

Comments
 (0)