diff options
| author | Vlad Lesin <vlad_lesin@mail.ru> | 2020-04-03 00:43:09 +0300 |
|---|---|---|
| committer | Vlad Lesin <vlad_lesin@mail.ru> | 2020-04-07 15:05:38 +0300 |
| commit | 5836191c8f0658d5d75484766fdcc3d838b0a5c1 (patch) | |
| tree | f55ca1a7ea0d0dbdf0757bb18bd9fd6d1f651081 /storage/innobase/fil/fil0fil.cc | |
| parent | cd88a606f5c50db2c6ffe79c8a1a2fa00c06d4c4 (diff) | |
| download | mariadb-git-5836191c8f0658d5d75484766fdcc3d838b0a5c1.tar.gz | |
MDEV-21168: Active XA transactions stop slave from working after backup
was restored.
Optionally rollback prepared XA's on "mariabackup --prepare".
The fix MUST NOT be ported on 10.5+, as MDEV-742 fix solves the issue for
slaves.
Diffstat (limited to 'storage/innobase/fil/fil0fil.cc')
| -rw-r--r-- | storage/innobase/fil/fil0fil.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/storage/innobase/fil/fil0fil.cc b/storage/innobase/fil/fil0fil.cc index 4192008ecf0..d4b0d3f4377 100644 --- a/storage/innobase/fil/fil0fil.cc +++ b/storage/innobase/fil/fil0fil.cc @@ -4253,6 +4253,7 @@ fil_ibd_discover( case SRV_OPERATION_RESTORE_DELTA: ut_ad(0); break; + case SRV_OPERATION_RESTORE_ROLLBACK_XA: case SRV_OPERATION_RESTORE_EXPORT: case SRV_OPERATION_RESTORE: break; @@ -4350,7 +4351,7 @@ fil_ibd_load( return(FIL_LOAD_OK); } - if (srv_operation == SRV_OPERATION_RESTORE) { + if (is_mariabackup_restore()) { /* Replace absolute DATA DIRECTORY file paths with short names relative to the backup directory. */ if (const char* name = strrchr(filename, OS_PATH_SEPARATOR)) { |