diff options
author | Dan Gudmundsson <[email protected]> | 2011-09-19 10:49:19 +0200 |
---|---|---|
committer | Dan Gudmundsson <[email protected]> | 2011-09-19 10:49:19 +0200 |
commit | 40f724a33dae5e7670a710e32abe3493d660ea46 (patch) | |
tree | b181a3e25adf5aa5c28d9a7fe022590004ee7be2 /lib/mnesia/src/mnesia_dumper.erl | |
parent | 87288e173f09d573460a06d98466f84cba8f4b5c (diff) | |
parent | 7ebf84abf7e5d06ce9ef6ec11783318aa393093d (diff) | |
download | otp-40f724a33dae5e7670a710e32abe3493d660ea46.tar.gz otp-40f724a33dae5e7670a710e32abe3493d660ea46.tar.bz2 otp-40f724a33dae5e7670a710e32abe3493d660ea46.zip |
Merge branch 'dev' into major
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(), |