summaryrefslogtreecommitdiff
path: root/extra/mariabackup
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2019-06-13 18:36:09 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2019-06-13 18:36:09 +0300
commit984d7100cdab91fb23d97c05e8b6329a90fe1583 (patch)
treedb323b31d44e10079fadf9de048972745cd89070 /extra/mariabackup
parentd46db415cef910c65b0e550a9d00fe188cfd8910 (diff)
parent8e3a4be45c551883d37e5598f0b4108ccf31521c (diff)
downloadmariadb-git-984d7100cdab91fb23d97c05e8b6329a90fe1583.tar.gz
Merge 10.4 into 10.5
Diffstat (limited to 'extra/mariabackup')
-rw-r--r--extra/mariabackup/xtrabackup.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/extra/mariabackup/xtrabackup.cc b/extra/mariabackup/xtrabackup.cc
index fb6c1f519a3..d666cd7aa13 100644
--- a/extra/mariabackup/xtrabackup.cc
+++ b/extra/mariabackup/xtrabackup.cc
@@ -5193,7 +5193,11 @@ next_file_item_1:
goto next_datadir_item;
}
- snprintf(dbpath, sizeof(dbpath)-1, "%s/%s", path, dbinfo.name);
+ snprintf(dbpath, sizeof(dbpath), "%.*s/%.*s",
+ OS_FILE_MAX_PATH/2-1,
+ path,
+ OS_FILE_MAX_PATH/2-1,
+ dbinfo.name);
os_normalize_path(dbpath);