aboutsummaryrefslogtreecommitdiffstats
path: root/lib/mnesia/src/mnesia_dumper.erl
diff options
context:
space:
mode:
authorMicael Karlberg <[email protected]>2011-09-19 19:26:54 +0200
committerMicael Karlberg <[email protected]>2011-09-19 19:26:54 +0200
commit7c730a573a7e239f41bc619b024a675667767428 (patch)
tree1265ca1ddae47b094af21f669d0526c9c1b074dd /lib/mnesia/src/mnesia_dumper.erl
parent13fcdd5c954ddbb8ac9401d73f8e77423fbd976c (diff)
parente84f232326b2800ca806c867b2bfbe3652d423cb (diff)
downloadotp-7c730a573a7e239f41bc619b024a675667767428.tar.gz
otp-7c730a573a7e239f41bc619b024a675667767428.tar.bz2
otp-7c730a573a7e239f41bc619b024a675667767428.zip
Merge branch 'dev' of super:otp into bmk/inets/inets571_integration
Diffstat (limited to 'lib/mnesia/src/mnesia_dumper.erl')
-rw-r--r--lib/mnesia/src/mnesia_dumper.erl7
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(),