summaryrefslogtreecommitdiff
path: root/extra/mariabackup
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2019-06-12 08:37:27 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2019-06-12 08:37:27 +0300
commit2fd82471aba9447e5490b24da5da89c33a21525e (patch)
tree562b878063c3d6224ba7090c7c01306a18561ec5 /extra/mariabackup
parent1f6b02e9f0059932da4a9c05fdfc26f473a89cde (diff)
parentb42dbdbccd3b939394ca9b608ad91a04235e95f1 (diff)
downloadmariadb-git-2fd82471aba9447e5490b24da5da89c33a21525e.tar.gz
Merge 10.3 into 10.4
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 a4b18950838..24bc739ca57 100644
--- a/extra/mariabackup/xtrabackup.cc
+++ b/extra/mariabackup/xtrabackup.cc
@@ -5205,7 +5205,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);