diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-26 15:03:37 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-26 15:03:37 +0200 |
| commit | ffc69dbd05d31f016f3ac53be9d878ce133e60d6 (patch) | |
| tree | 056faecdd7c90011e5729943725cd038019bc683 /extra | |
| parent | dbc0d576a3f402ae52423fe424ed0a68f49537ef (diff) | |
| parent | ac4934535daadba0a45ffa407a7643ca3ff2712a (diff) | |
| download | mariadb-git-ffc69dbd05d31f016f3ac53be9d878ce133e60d6.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/mariabackup/backup_copy.cc | 1 | ||||
| -rw-r--r-- | extra/mariabackup/changed_page_bitmap.cc | 1 | ||||
| -rw-r--r-- | extra/mariabackup/ds_compress.cc | 1 | ||||
| -rw-r--r-- | extra/mariabackup/xtrabackup.cc | 1 |
4 files changed, 4 insertions, 0 deletions
diff --git a/extra/mariabackup/backup_copy.cc b/extra/mariabackup/backup_copy.cc index 39171f29a2a..293b8d02af2 100644 --- a/extra/mariabackup/backup_copy.cc +++ b/extra/mariabackup/backup_copy.cc @@ -1210,6 +1210,7 @@ copy_or_move_file(const char *src_file_path, if (!directory_exists(dst_dir, true)) { ret = false; + free(link_filepath); goto cleanup; } diff --git a/extra/mariabackup/changed_page_bitmap.cc b/extra/mariabackup/changed_page_bitmap.cc index bff5f64e8fa..53fd4995b7c 100644 --- a/extra/mariabackup/changed_page_bitmap.cc +++ b/extra/mariabackup/changed_page_bitmap.cc @@ -381,6 +381,7 @@ log_online_setup_bitmap_file_range( msg("InnoDB: Error: inconsistent bitmap file " "directory"); + os_file_closedir(bitmap_dir); free(bitmap_files->files); return FALSE; } diff --git a/extra/mariabackup/ds_compress.cc b/extra/mariabackup/ds_compress.cc index 7f4744ec972..7c2360dbadb 100644 --- a/extra/mariabackup/ds_compress.cc +++ b/extra/mariabackup/ds_compress.cc @@ -385,6 +385,7 @@ create_worker_threads(uint n) return threads; err: + my_free(threads); return NULL; } diff --git a/extra/mariabackup/xtrabackup.cc b/extra/mariabackup/xtrabackup.cc index e8dee510f63..001cce29933 100644 --- a/extra/mariabackup/xtrabackup.cc +++ b/extra/mariabackup/xtrabackup.cc @@ -5230,6 +5230,7 @@ next_file_item_1: fileinfo.name, NULL)) { os_file_closedir(dbdir); + os_file_closedir(dir); return(FALSE); } } |