diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-12-04 11:46:47 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-12-04 11:46:47 +0200 |
| commit | 1eb59c307de163b507efade1fc372d8ff2bb94b7 (patch) | |
| tree | 07bad1d966d29e253f402840b9461cc27e39b0af /extra/mariabackup/xtrabackup.cc | |
| parent | 178d32f03b84004af3611aab7c6fb9ce0b1388f4 (diff) | |
| download | mariadb-git-1eb59c307de163b507efade1fc372d8ff2bb94b7.tar.gz | |
MDEV-24340 Unique final message of InnoDB during shutdownbb-10.2-MDEV-24340
innobase_space_shutdown(): Remove. We want this step to be executed
before the message "InnoDB: Shutdown completed; log sequence number "
is output by innodb_shutdown(). It used to be executed after that step.
innodb_shutdown(): Duplicate the code that used to live in
innobase_space_shutdown().
innobase_init_abort(): Merge with innobase_space_shutdown().
Diffstat (limited to 'extra/mariabackup/xtrabackup.cc')
| -rw-r--r-- | extra/mariabackup/xtrabackup.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/extra/mariabackup/xtrabackup.cc b/extra/mariabackup/xtrabackup.cc index 20a8a562fa5..241d7aeb198 100644 --- a/extra/mariabackup/xtrabackup.cc +++ b/extra/mariabackup/xtrabackup.cc @@ -6073,12 +6073,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 */ |