aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorUlf Wiger <[email protected]>2010-06-01 18:26:33 +0200
committerRaimo Niskanen <[email protected]>2010-06-02 09:28:54 +0200
commit7abf61746145e83d671845af11d0a7acad09c522 (patch)
treec61c7766533cd90f2408a32cde33d1fe7b6a2554 /lib
parentf58fcc6a8698b693ac0d4ff5c90d6b83d24e3c6a (diff)
downloadotp-7abf61746145e83d671845af11d0a7acad09c522.tar.gz
otp-7abf61746145e83d671845af11d0a7acad09c522.tar.bz2
otp-7abf61746145e83d671845af11d0a7acad09c522.zip
remove debug printout and accidental variable name reuse
Diffstat (limited to 'lib')
-rw-r--r--lib/mnesia/src/mnesia_schema.erl6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/mnesia/src/mnesia_schema.erl b/lib/mnesia/src/mnesia_schema.erl
index 5fb72d7f59..83e8a140a9 100644
--- a/lib/mnesia/src/mnesia_schema.erl
+++ b/lib/mnesia/src/mnesia_schema.erl
@@ -2660,7 +2660,6 @@ merge_schema(UserFun) ->
do_merge_schema(LockTabs0) ->
{_Mod, Tid, Ts} = get_tid_ts_and_lock(schema, write),
LockTabs = [{T, tab_to_nodes(T)} || T <- LockTabs0],
- io:fwrite("LockTabs = ~p~n", [LockTabs]),
[get_tid_ts_and_lock(T,write) || {T,_} <- LockTabs],
Connected = val(recover_nodes),
Running = val({current, db_nodes}),
@@ -2673,10 +2672,11 @@ do_merge_schema(LockTabs0) ->
mnesia:abort({bad_commit, {missing_lock, Miss}})
end,
case Connected -- Running of
- [Node | _] = NewNodes ->
+ [Node | _] = OtherNodes ->
%% Time for a schema merging party!
mnesia_locker:wlock_no_exist(Tid, Store, schema, [Node]),
- [mnesia_locker:wlock_no_exist(Tid, Store, T, mnesia_lib:intersect(Ns, NewNodes))
+ [mnesia_locker:wlock_no_exist(
+ Tid, Store, T, mnesia_lib:intersect(Ns, OtherNodes))
|| {T,Ns} <- LockTabs],
case rpc:call(Node, mnesia_controller, get_cstructs, []) of
{cstructs, Cstructs, RemoteRunning1} ->