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 /storage/innobase/srv | |
| 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 'storage/innobase/srv')
| -rw-r--r-- | storage/innobase/srv/srv0start.cc | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/storage/innobase/srv/srv0start.cc b/storage/innobase/srv/srv0start.cc index 0d8ebbe98cd..a7be1cdbf21 100644 --- a/storage/innobase/srv/srv0start.cc +++ b/storage/innobase/srv/srv0start.cc @@ -2913,6 +2913,17 @@ innodb_shutdown() fclose(dict_foreign_err_file); } + srv_sys_space.shutdown(); + if (srv_tmp_space.get_sanity_check_status()) { + fil_space_close(srv_tmp_space.name()); + srv_tmp_space.delete_files(); + } + srv_tmp_space.shutdown(); + +#ifdef WITH_INNODB_DISALLOW_WRITES + os_event_destroy(srv_allow_writes_event); +#endif /* WITH_INNODB_DISALLOW_WRITES */ + if (srv_was_started && srv_print_verbose_log) { ib::info() << "Shutdown completed; log sequence number " << srv_shutdown_lsn; |