diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-13 18:18:25 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-13 18:18:25 +0300 |
| commit | 4bd56a697ff2d2edc230a82dbfcf4412ef0996df (patch) | |
| tree | 77a6e74518875d83ecaf6447b5f5b8801ef50b2f /storage/maria | |
| parent | 863e28ff3ed0a5859561c397cbfb492170989ddd (diff) | |
| parent | 3e617b8bef50a81b10b8152d800a1b8b38859913 (diff) | |
| download | mariadb-git-4bd56a697ff2d2edc230a82dbfcf4412ef0996df.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'storage/maria')
| -rw-r--r-- | storage/maria/ma_create.c | 3 | ||||
| -rw-r--r-- | storage/maria/ma_loghandler.c | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/storage/maria/ma_create.c b/storage/maria/ma_create.c index 0e5de2f8b89..9b9dfadfe54 100644 --- a/storage/maria/ma_create.c +++ b/storage/maria/ma_create.c @@ -75,7 +75,7 @@ int maria_create(const char *name, enum data_file_type datafile_type, uint max_field_lengths, extra_header_size, column_nr; uint internal_table= flags & HA_CREATE_INTERNAL_TABLE; ulong reclength, real_reclength,min_pack_length; - char kfilename[FN_REFLEN], klinkname[FN_REFLEN], *klinkname_ptr; + char kfilename[FN_REFLEN], klinkname[FN_REFLEN], *klinkname_ptr= NullS; char dfilename[FN_REFLEN], dlinkname[FN_REFLEN], *dlinkname_ptr= 0; ulong pack_reclength; ulonglong tot_length,max_rows, tmp; @@ -889,7 +889,6 @@ int maria_create(const char *name, enum data_file_type datafile_type, fn_format(kfilename, name, "", MARIA_NAME_IEXT, MY_UNPACK_FILENAME | MY_RETURN_REAL_PATH | (have_iext ? MY_REPLACE_EXT : MY_APPEND_EXT)); - klinkname_ptr= NullS; /* Replace the current file. Don't sync dir now if the data file has the same path. diff --git a/storage/maria/ma_loghandler.c b/storage/maria/ma_loghandler.c index f6a2919ddf5..aa4afaaec1a 100644 --- a/storage/maria/ma_loghandler.c +++ b/storage/maria/ma_loghandler.c @@ -3617,7 +3617,8 @@ my_bool translog_init_with_table(const char *directory, int old_log_was_recovered= 0, logs_found= 0; uint old_flags= flags; uint32 start_file_num= 1; - TRANSLOG_ADDRESS sure_page, last_page, last_valid_page, checkpoint_lsn; + TRANSLOG_ADDRESS UNINIT_VAR(sure_page), last_page, last_valid_page, + checkpoint_lsn; my_bool version_changed= 0; DBUG_ENTER("translog_init_with_table"); |