summaryrefslogtreecommitdiff
path: root/lib/mnesia
diff options
context:
space:
mode:
authorLukas Larsson <lukas@erlang.org>2021-09-29 11:40:48 +0200
committerLukas Larsson <lukas@erlang.org>2021-09-29 11:40:48 +0200
commit89d68dfc9f70cd668fef05bf4ee35984d541662f (patch)
treefea374da8979111a80e92725b51231309caa767c /lib/mnesia
parentc730c47fa4d22507d6210f8da8e9e6070b20bac8 (diff)
parent7a8338768e0ee46cb0b02f4820998b82b5e9c200 (diff)
downloaderlang-89d68dfc9f70cd668fef05bf4ee35984d541662f.tar.gz
Merge branch 'maint'
Diffstat (limited to 'lib/mnesia')
-rw-r--r--lib/mnesia/doc/src/mnesia.xml12
-rw-r--r--lib/mnesia/src/mnesia_loader.erl2
2 files changed, 3 insertions, 11 deletions
diff --git a/lib/mnesia/doc/src/mnesia.xml b/lib/mnesia/doc/src/mnesia.xml
index f39d64b6ab..7fe31c08d8 100644
--- a/lib/mnesia/doc/src/mnesia.xml
+++ b/lib/mnesia/doc/src/mnesia.xml
@@ -1464,14 +1464,6 @@ mnesia:create_table(person,
</desc>
</func>
<func>
- <name name="install_fallback" arity="1" since=""/>
- <fsummary>Installs a backup as fallback.</fsummary>
- <desc>
- <p>Calls <c>mnesia:install_fallback(Opaque, Args)</c>, where
- <c>Args</c> is <c>[{scope, global}, {module, BackupMod}]</c>.</p>
- </desc>
- </func>
- <func>
<name name="install_fallback" arity="2" since=""/>
<fsummary>Installs a backup as fallback.</fsummary>
<desc>
@@ -2645,8 +2637,8 @@ mnesia:create_table(employee,
add_family({family, F, M, Children}) ->
ChildOids = lists:map(fun oid/1, Children),
Trans = fun() ->
- mnesia:write(F#person{children = ChildOids},
- mnesia:write(M#person{children = ChildOids},
+ mnesia:write(F#person{children = ChildOids}),
+ mnesia:write(M#person{children = ChildOids}),
Write = fun(Child) -> mnesia:write(Child) end,
lists:foreach(Write, Children)
end,
diff --git a/lib/mnesia/src/mnesia_loader.erl b/lib/mnesia/src/mnesia_loader.erl
index b7e7f98499..b0b4ac023f 100644
--- a/lib/mnesia/src/mnesia_loader.erl
+++ b/lib/mnesia/src/mnesia_loader.erl
@@ -180,7 +180,7 @@ do_get_disc_copy2(Tab, Reason, Storage = {ext, Alias, Mod}, _Type) ->
%%
%% Grab read lock on table
%% Block dirty updates
-%% Update wherabouts
+%% Update whereabouts
%%
%% Cancel the update subscription
%% Process the subscription events