diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-11-07 10:34:33 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-11-07 10:34:33 +0200 |
| commit | 77e8a311e1f919f15845c75d08de4340965c0bc4 (patch) | |
| tree | 7afc1e49694bb16fcdc07495a294a8d89b62f5eb /extra | |
| parent | 3ad37ed0eb343cd173b103974aded5783958a88e (diff) | |
| parent | c24ec3cece6d8bf70dac7519b6fd397c464f7a82 (diff) | |
| download | mariadb-git-77e8a311e1f919f15845c75d08de4340965c0bc4.tar.gz | |
Merge 10.4 into 10.5
A conflict between MDEV-19514 (b42294bc6409794bdbd2051b32fa079d81cea61d)
and MDEV-20934 (d7a2401750bb29dfdb45929a536539b9f17b347f)
was resolved. We will not invoke the function ibuf_delete_recs()
from ibuf_merge_or_delete_for_page(). Instead, we will add that
logic to the function ibuf_read_merge_pages().
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/mariabackup/backup_copy.cc | 2 | ||||
| -rw-r--r-- | extra/mariabackup/changed_page_bitmap.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/extra/mariabackup/backup_copy.cc b/extra/mariabackup/backup_copy.cc index 21e574ae3b8..6ede0288e3a 100644 --- a/extra/mariabackup/backup_copy.cc +++ b/extra/mariabackup/backup_copy.cc @@ -478,7 +478,7 @@ struct datafile_cur_t { { memset(rel_path, 0, sizeof rel_path); if (filename) { - strncpy(abs_path, filename, sizeof abs_path); + strncpy(abs_path, filename, sizeof abs_path - 1); abs_path[(sizeof abs_path) - 1] = 0; } else { abs_path[0] = '\0'; diff --git a/extra/mariabackup/changed_page_bitmap.cc b/extra/mariabackup/changed_page_bitmap.cc index fcfb33c500a..5266bed800d 100644 --- a/extra/mariabackup/changed_page_bitmap.cc +++ b/extra/mariabackup/changed_page_bitmap.cc @@ -390,7 +390,7 @@ log_online_setup_bitmap_file_range( bitmap_files->files[array_pos].seq_num = file_seq_num; strncpy(bitmap_files->files[array_pos].name, - bitmap_dir_file_info.name, FN_REFLEN); + bitmap_dir_file_info.name, FN_REFLEN - 1); bitmap_files->files[array_pos].name[FN_REFLEN - 1] = '\0'; bitmap_files->files[array_pos].start_lsn |