diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-26 14:17:19 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-26 14:17:19 +0200 |
| commit | 226ca250ed841fa57c8b15e3a5174cec5bd961e6 (patch) | |
| tree | 5227221d70a69208effd1a652783100605b8442f /extra | |
| parent | b30bbb7d9a1c3855c901b74735660e49ab64a2a8 (diff) | |
| parent | 42fd53724420627da65c3862f0fef0acffca3241 (diff) | |
| download | mariadb-git-226ca250ed841fa57c8b15e3a5174cec5bd961e6.tar.gz | |
Merge 10.1 into 10.2
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 7543ed89b1f..30ec5539c2d 100644 --- a/extra/mariabackup/backup_copy.cc +++ b/extra/mariabackup/backup_copy.cc @@ -1213,6 +1213,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 c336aa1229d..f6e9812b0c5 100644 --- a/extra/mariabackup/changed_page_bitmap.cc +++ b/extra/mariabackup/changed_page_bitmap.cc @@ -380,6 +380,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 16dbe4ffb34..e356ff6ac97 100644 --- a/extra/mariabackup/ds_compress.cc +++ b/extra/mariabackup/ds_compress.cc @@ -384,6 +384,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 d03f657d487..94409c846a5 100644 --- a/extra/mariabackup/xtrabackup.cc +++ b/extra/mariabackup/xtrabackup.cc @@ -5278,6 +5278,7 @@ next_file_item_1: fileinfo.name, NULL)) { os_file_closedir(dbdir); + os_file_closedir(dir); return(FALSE); } } |