summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2019-01-14 11:37:51 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2019-01-14 11:37:51 +0200
commit248dc12e60d5e3ba269fe2a13689bca32790f9f5 (patch)
tree81387df3737a081fd0ba855d8275d7aab2283e40 /extra
parentf5ee7fb31f25c88113bdd688d8764a9eaed339bc (diff)
parent7372fe4da195f465a2f13984dcd89325ec361c43 (diff)
downloadmariadb-git-248dc12e60d5e3ba269fe2a13689bca32790f9f5.tar.gz
Merge 10.1 into 10.2
Diffstat (limited to 'extra')
-rw-r--r--extra/mariabackup/xtrabackup.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/extra/mariabackup/xtrabackup.cc b/extra/mariabackup/xtrabackup.cc
index 4d5fc98fcd6..3ec6523c6dd 100644
--- a/extra/mariabackup/xtrabackup.cc
+++ b/extra/mariabackup/xtrabackup.cc
@@ -5262,6 +5262,7 @@ xb_process_datadir(
path, NULL,
fileinfo.name, NULL))
{
+ os_file_closedir(dbdir);
return(FALSE);
}
}
@@ -5323,6 +5324,7 @@ next_file_item_1:
dbinfo.name,
fileinfo.name, NULL))
{
+ os_file_closedir(dbdir);
return(FALSE);
}
}