diff options
author | Dan Gudmundsson <[email protected]> | 2013-11-29 09:58:26 +0100 |
---|---|---|
committer | Dan Gudmundsson <[email protected]> | 2013-11-29 09:58:26 +0100 |
commit | 423d37395076528866c4b689c0f1e9b72dae58e1 (patch) | |
tree | b7e8a58df2c8c380d10e275102c07fa737d24908 /lib/mnesia/src/mnesia_tm.erl | |
parent | a4565bd7d6e8362b3ca1ff0caedf7407e81d67cb (diff) | |
parent | 0279799e4f3d2404f657863d04d8c1d6f6c08985 (diff) | |
download | otp-423d37395076528866c4b689c0f1e9b72dae58e1.tar.gz otp-423d37395076528866c4b689c0f1e9b72dae58e1.tar.bz2 otp-423d37395076528866c4b689c0f1e9b72dae58e1.zip |
Merge branch 'maint'
Conflicts:
erts/etc/win32/Install.c
Diffstat (limited to 'lib/mnesia/src/mnesia_tm.erl')
-rw-r--r-- | lib/mnesia/src/mnesia_tm.erl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/mnesia/src/mnesia_tm.erl b/lib/mnesia/src/mnesia_tm.erl index e54e5c4e88..17af0cad44 100644 --- a/lib/mnesia/src/mnesia_tm.erl +++ b/lib/mnesia/src/mnesia_tm.erl @@ -181,7 +181,7 @@ mnesia_down(Node) -> %% mnesia_monitor takes care of the sync case whereis(?MODULE) of undefined -> - mnesia_monitor:mnesia_down(?MODULE, {Node, []}); + mnesia_monitor:mnesia_down(?MODULE, Node); Pid -> Pid ! {mnesia_down, Node} end. @@ -403,7 +403,9 @@ doit_loop(#state{coordinators=Coordinators,participants=Participants,supervisor= Tids = gb_trees:keys(Participants), reconfigure_participants(N, gb_trees:values(Participants)), NewState = clear_fixtable(N, State), - mnesia_monitor:mnesia_down(?MODULE, {N, Tids}), + + mnesia_locker:mnesia_down(N, Tids), + mnesia_monitor:mnesia_down(?MODULE, N), doit_loop(NewState); {From, {unblock_me, Tab}} -> |