summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@mariadb.com>2017-04-20 19:23:07 +0000
committerVladislav Vaintroub <wlad@mariadb.com>2017-04-20 19:23:07 +0000
commitd1ffd642540d128a04fd3cca2c8331099fcbda08 (patch)
tree6a0c7fa5b0370bf958d0bb1f3f041e28f18da143
parent30f9bc1016e5a3bcca634d48a61f3d5273fbb41b (diff)
downloadmariadb-git-bb-10.1-xb-rebase.tar.gz
mariabackup - do not extend innodb tablespaces in prepare, unlessbb-10.1-xb-rebase
incremental prepare is running.
-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;