summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2020-12-23 14:52:59 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2020-12-23 14:52:59 +0200
commit0aa02567dd62d96467f84ba96cc67b103f63c9e0 (patch)
tree6c379b5f7d84fdb8e724907448a4f015d89881f6 /extra
parent04741dc736e803b0a91c76d19de464e25b4a1977 (diff)
parentfa1aef39ebc7d84d24d4e3d2124f982526632ee9 (diff)
downloadmariadb-git-0aa02567dd62d96467f84ba96cc67b103f63c9e0.tar.gz
Merge 10.3 into 10.4
Diffstat (limited to 'extra')
-rw-r--r--extra/mariabackup/xtrabackup.cc5
1 files changed, 1 insertions, 4 deletions
diff --git a/extra/mariabackup/xtrabackup.cc b/extra/mariabackup/xtrabackup.cc
index 45d0d0e1111..e16a9ec69a0 100644
--- a/extra/mariabackup/xtrabackup.cc
+++ b/extra/mariabackup/xtrabackup.cc
@@ -6020,12 +6020,9 @@ static bool xtrabackup_prepare_func(char** argv)
srv_shutdown_bg_undo_sources();
srv_purge_shutdown();
buf_flush_sync_all_buf_pools();
- innodb_shutdown();
- innobase_space_shutdown();
}
- else
- innodb_shutdown();
+ innodb_shutdown();
innodb_free_param();
/* output to metadata file */