diff options
| author | Dan Gudmundsson <[email protected]> | 2011-09-19 10:45:32 +0200 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2011-09-19 10:45:32 +0200 |
| commit | 7ebf84abf7e5d06ce9ef6ec11783318aa393093d (patch) | |
| tree | de28f5b237c1f776fa2691e53a6b7c6d9f5f9a9e /lib/mnesia/src/mnesia_dumper.erl | |
| parent | 2d13b9580f405541e46491743702eaaedf3f6e91 (diff) | |
| parent | 34f20bde33f7c4480ac78f56c7aa1a50ac12b14d (diff) | |
| download | otp-7ebf84abf7e5d06ce9ef6ec11783318aa393093d.tar.gz otp-7ebf84abf7e5d06ce9ef6ec11783318aa393093d.tar.bz2 otp-7ebf84abf7e5d06ce9ef6ec11783318aa393093d.zip | |
Merge branch 'dgud/mnesia/fix-compat/OTP-9473' into dev
* dgud/mnesia/fix-compat/OTP-9473:
[mnesia] Fix schema conversion to previous versions
[mnesia] Whitespace fixes
[mnesia] Update protocol version
[mnesia] Mnesia schema merge tested with 2 nodes, r13b04 -> r14b (dev)
[mnesia] Fixed bug in aborted schema transactions
[mnesia] Add hrl dependency
Diffstat (limited to 'lib/mnesia/src/mnesia_dumper.erl')
| -rw-r--r-- | lib/mnesia/src/mnesia_dumper.erl | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/mnesia/src/mnesia_dumper.erl b/lib/mnesia/src/mnesia_dumper.erl index 92fd9dfade..daa9e6aff2 100644 --- a/lib/mnesia/src/mnesia_dumper.erl +++ b/lib/mnesia/src/mnesia_dumper.erl @@ -214,7 +214,12 @@ insert_rec(Rec, InPlace, InitBy, LogV) when is_record(Rec, commit) -> {Tid, committed} -> do_insert_rec(Tid, Rec, InPlace, InitBy, LogV); {Tid, aborted} -> - mnesia_schema:undo_prepare_commit(Tid, Rec) + case InitBy of + startup -> + mnesia_schema:undo_prepare_commit(Tid, Rec); + _ -> + ok + end end; insert_rec(H, _InPlace, _InitBy, _LogV) when is_record(H, log_header) -> CurrentVersion = mnesia_log:version(), |