diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-13 12:52:57 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-13 12:52:57 +0300 |
| commit | 38f6c47f8a0a9bc313e4875c4676985249771c76 (patch) | |
| tree | 0cb876cdf2ead314e2fad565c9d71550cc40b412 /storage/innobase/srv/srv0start.cc | |
| parent | 9f20968169e21fcf8941041a8a7ce06013a79bd9 (diff) | |
| parent | 15fa70b8408a2146b300a4e1b19819addafa5929 (diff) | |
| download | mariadb-git-38f6c47f8a0a9bc313e4875c4676985249771c76.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'storage/innobase/srv/srv0start.cc')
| -rw-r--r-- | storage/innobase/srv/srv0start.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/storage/innobase/srv/srv0start.cc b/storage/innobase/srv/srv0start.cc index 42d40d0fd7e..b54f96a3692 100644 --- a/storage/innobase/srv/srv0start.cc +++ b/storage/innobase/srv/srv0start.cc @@ -2430,11 +2430,15 @@ void innodb_shutdown() ut_ad(!srv_undo_sources); switch (srv_operation) { + case SRV_OPERATION_RESTORE_ROLLBACK_XA: + if (dberr_t err = fil_write_flushed_lsn(log_sys.lsn)) + ib::error() << "Writing flushed lsn " << log_sys.lsn + << " failed; error=" << err; + /* fall through */ case SRV_OPERATION_BACKUP: case SRV_OPERATION_RESTORE: case SRV_OPERATION_RESTORE_DELTA: case SRV_OPERATION_RESTORE_EXPORT: - case SRV_OPERATION_RESTORE_ROLLBACK_XA: fil_close_all_files(); break; case SRV_OPERATION_NORMAL: |