diff options
| author | Andrew Hutchings <andrew@mariadb.org> | 2023-01-18 16:16:34 +0000 |
|---|---|---|
| committer | Andrew Hutchings <andrew@linuxjedi.co.uk> | 2023-02-14 16:27:21 +0000 |
| commit | 690fcfbd2954f9470047ce754c2a5c2fdfd15cf3 (patch) | |
| tree | e983e0a69ad1bf472266e10364a184e4f9c1ff66 | |
| parent | 1a5c7552ea3a0233e7abff56a167c3a532c7da0a (diff) | |
| download | mariadb-git-690fcfbd2954f9470047ce754c2a5c2fdfd15cf3.tar.gz | |
Fix S3 engine Coverity hits
Very minor hits found by Coverity for the S3 engine.
| -rw-r--r-- | storage/maria/ha_s3.cc | 2 | ||||
| -rw-r--r-- | storage/maria/s3_func.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/storage/maria/ha_s3.cc b/storage/maria/ha_s3.cc index 158fa8d0430..b75481b3fc2 100644 --- a/storage/maria/ha_s3.cc +++ b/storage/maria/ha_s3.cc @@ -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 | diff --git a/storage/maria/s3_func.c b/storage/maria/s3_func.c index 491a8e0a323..3d18ba8800d 100644 --- a/storage/maria/s3_func.c +++ b/storage/maria/s3_func.c @@ -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; |