summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2019-06-11 13:00:18 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2019-06-11 13:00:18 +0300
commitb42dbdbccd3b939394ca9b608ad91a04235e95f1 (patch)
treee969f314963faa202fdb6f87d5aca67810844742 /extra
parent490dcfd5d74ce45cbdd6105e4295116f6a944e2b (diff)
parentcbac8f935182ecc5bb907de3ae48942467f0b8ba (diff)
downloadmariadb-git-b42dbdbccd3b939394ca9b608ad91a04235e95f1.tar.gz
Merge 10.2 into 10.3
Diffstat (limited to 'extra')
-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 78df15c8af5..c06d677786c 100644
--- a/extra/mariabackup/xtrabackup.cc
+++ b/extra/mariabackup/xtrabackup.cc
@@ -5189,7 +5189,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);