diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-13 11:45:05 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-13 11:45:05 +0300 |
| commit | 15fa70b8408a2146b300a4e1b19819addafa5929 (patch) | |
| tree | 228e88d1e8e3b3d46f5a54ab6e1bdcdd4478b82e /storage/innobase/srv | |
| parent | 19d4e023c681ecb26acf06318e69ecae6c4ec9be (diff) | |
| parent | 6bc4444d7ca81786de98f27669891692c2d2e21c (diff) | |
| download | mariadb-git-15fa70b8408a2146b300a4e1b19819addafa5929.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'storage/innobase/srv')
| -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 2f1238d5361..4470ecc5e23 100644 --- a/storage/innobase/srv/srv0start.cc +++ b/storage/innobase/srv/srv0start.cc @@ -2538,11 +2538,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: |