summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@mariadb.com>2018-04-11 23:22:33 +0100
committerVladislav Vaintroub <wlad@mariadb.com>2018-04-11 23:25:45 +0100
commit4c7a1a1b9effd9497e14b4135b767f55ad8c93e9 (patch)
tree6729c5148f9102ba75a946619a46f7089af9166a
parent740fc2ae084f8f81990de557d696aefbc507752d (diff)
downloadmariadb-git-4c7a1a1b9effd9497e14b4135b767f55ad8c93e9.tar.gz
MDEV-15780 : mariabackup does not handle absolute names in for system tablespaces
Fix 10.2-specific bug - copy-back is not prepared to handle system tablespaces with absolute path.
-rw-r--r--extra/mariabackup/backup_copy.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/extra/mariabackup/backup_copy.cc b/extra/mariabackup/backup_copy.cc
index a2677f778f4..b15887fee4c 100644
--- a/extra/mariabackup/backup_copy.cc
+++ b/extra/mariabackup/backup_copy.cc
@@ -1816,7 +1816,8 @@ copy_back()
is_ibdata_file = false;
for (Tablespace::const_iterator iter(srv_sys_space.begin()),
end(srv_sys_space.end()); iter != end; ++iter) {
- if (strcmp(iter->name(), filename) == 0) {
+ const char *ibfile = base_name(iter->name());
+ if (strcmp(ibfile, filename) == 0) {
is_ibdata_file = true;
break;
}