diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-13 18:48:41 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-13 18:48:41 +0300 |
| commit | 2f7b37b02154748b223e385a7d7787900ab37b5e (patch) | |
| tree | 49a5ab1928bd840c129bd14ce72c5cf2c0190e20 /storage/myisam | |
| parent | 7f03b1d78f2aab738e38a1e33ac887757604585a (diff) | |
| parent | b811c6ecc74cc1421eedc92573447768d1eb7980 (diff) | |
| download | mariadb-git-2f7b37b02154748b223e385a7d7787900ab37b5e.tar.gz | |
Merge 10.3 into 10.4, except MDEV-22543
Also, fix GCC -Og -Wmaybe-uninitialized in run_backup_stage()
Diffstat (limited to 'storage/myisam')
| -rw-r--r-- | storage/myisam/mi_create.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/storage/myisam/mi_create.c b/storage/myisam/mi_create.c index fd230698acc..9f17a9b2de9 100644 --- a/storage/myisam/mi_create.c +++ b/storage/myisam/mi_create.c @@ -46,7 +46,7 @@ int mi_create(const char *name,uint keys,MI_KEYDEF *keydefs, uint aligned_key_start, block_length, res; 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= 0; char dfilename[FN_REFLEN],dlinkname[FN_REFLEN], *dlinkname_ptr= 0; ulong pack_reclength; ulonglong tot_length,max_rows, tmp; @@ -622,7 +622,6 @@ int mi_create(const char *name,uint keys,MI_KEYDEF *keydefs, fn_format(kfilename, name, "", MI_NAME_IEXT, MY_UNPACK_FILENAME | MY_RETURN_REAL_PATH | (have_iext ? MY_REPLACE_EXT : MY_APPEND_EXT)); - klinkname_ptr= 0; /* Replace the current file */ create_flag=(flags & HA_CREATE_KEEP_FILES) ? 0 : MY_DELETE_OLD; } |