summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2020-12-23 14:25:45 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2020-12-23 14:25:45 +0200
commitfa1aef39ebc7d84d24d4e3d2124f982526632ee9 (patch)
tree08c7c3badde31bf2d9613204846f07e02ce36f0a /extra
parent097786c485c6d10064e8bc593b6aa54e477712f9 (diff)
parent1eb59c307de163b507efade1fc372d8ff2bb94b7 (diff)
downloadmariadb-git-fa1aef39ebc7d84d24d4e3d2124f982526632ee9.tar.gz
Merge 10.2 into 10.3
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 e705c00465f..57af73bfd0d 100644
--- a/extra/mariabackup/xtrabackup.cc
+++ b/extra/mariabackup/xtrabackup.cc
@@ -6010,12 +6010,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 */