summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@mariadb.com>2017-04-20 19:23:07 +0000
committerSergei Golubchik <serg@mariadb.org>2017-04-27 19:12:43 +0200
commite8bc838eb9ee4aa8de11bfa2472c9784df78590f (patch)
tree23655e1311c3096e0ae7b1ccd47b928c4e4d46ce /extra
parentecb25df21b2cc9bcbb038dd9b82b8469acd18fd9 (diff)
downloadmariadb-git-e8bc838eb9ee4aa8de11bfa2472c9784df78590f.tar.gz
mariabackup - do not extend innodb tablespaces in prepare, unless
incremental prepare is running.
Diffstat (limited to 'extra')
-rw-r--r--extra/mariabackup/xtrabackup.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/extra/mariabackup/xtrabackup.cc b/extra/mariabackup/xtrabackup.cc
index d16687926aa..c6962069315 100644
--- a/extra/mariabackup/xtrabackup.cc
+++ b/extra/mariabackup/xtrabackup.cc
@@ -6546,6 +6546,8 @@ skip_check:
if(innodb_init())
goto error_cleanup;
+ if (xtrabackup_incremental) {
+
it = datafiles_iter_new(fil_system);
if (it == NULL) {
msg("xtrabackup: Error: datafiles_iter_new() failed.\n");
@@ -6588,6 +6590,8 @@ skip_check:
datafiles_iter_free(it);
+ } /* if (xtrabackup_incremental) */
+
if (xtrabackup_export) {
msg("xtrabackup: export option is specified.\n");
os_file_t info_file = XB_FILE_UNDEFINED;