diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2023-01-28 18:22:55 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2023-01-28 18:22:55 +0100 |
| commit | a977054ee0bd1601a5252ec02459bac0241d9bfc (patch) | |
| tree | fa5d780bbdcd977294e519e6890fa2ea48436f8c /extra/mariabackup/xtrabackup.cc | |
| parent | 765291d63e0c2a10c513a354e9ecb2e905570775 (diff) | |
| parent | c73985f2ce8a391582787f3e310a011c1a712bec (diff) | |
| download | mariadb-git-a977054ee0bd1601a5252ec02459bac0241d9bfc.tar.gz | |
Merge branch '10.3' into 10.4
Diffstat (limited to 'extra/mariabackup/xtrabackup.cc')
| -rw-r--r-- | extra/mariabackup/xtrabackup.cc | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/extra/mariabackup/xtrabackup.cc b/extra/mariabackup/xtrabackup.cc index 11e638e307c..bb440eec7f8 100644 --- a/extra/mariabackup/xtrabackup.cc +++ b/extra/mariabackup/xtrabackup.cc @@ -4460,11 +4460,13 @@ static bool xtrabackup_backup_low() dst_log_file = NULL; - if(!xtrabackup_incremental) { - strcpy(metadata_type, "full-backuped"); + if (!xtrabackup_incremental) { + safe_strcpy(metadata_type, sizeof(metadata_type), + "full-backuped"); metadata_from_lsn = 0; } else { - strcpy(metadata_type, "incremental"); + safe_strcpy(metadata_type, sizeof(metadata_type), + "incremental"); metadata_from_lsn = incremental_lsn; } metadata_last_lsn = log_copy_scanned_lsn; @@ -6211,7 +6213,8 @@ static bool xtrabackup_prepare_func(char** argv) if (ok) { char filename[FN_REFLEN]; - strcpy(metadata_type, "log-applied"); + safe_strcpy(metadata_type, sizeof(metadata_type), + "log-applied"); if(xtrabackup_incremental && metadata_to_lsn < incremental_to_lsn) |