aboutsummaryrefslogtreecommitdiffstats
path: root/lib/mnesia/src/mnesia_sup.erl
diff options
context:
space:
mode:
authorFredrik Gustafsson <[email protected]>2013-01-22 10:28:53 +0100
committerFredrik Gustafsson <[email protected]>2013-01-22 10:28:53 +0100
commit2db94d0e84729a8f2a474a7cf02e9c94853a1bbe (patch)
treecbf84d3a25f47ff351d77073744504a8fecd6a81 /lib/mnesia/src/mnesia_sup.erl
parent4bc96ac57616e089d8508e64973e49b6f8db97ea (diff)
parent13d4a8d4e69a8965ab66685e751d11cda5f29567 (diff)
downloadotp-2db94d0e84729a8f2a474a7cf02e9c94853a1bbe.tar.gz
otp-2db94d0e84729a8f2a474a7cf02e9c94853a1bbe.tar.bz2
otp-2db94d0e84729a8f2a474a7cf02e9c94853a1bbe.zip
Merge branch 'lh/forget-mnemosyne/OTP-10729'
* lh/forget-mnemosyne/OTP-10729: Remove what remains of the Mnemosyne code Remove support for the query keyword and query expressions
Diffstat (limited to 'lib/mnesia/src/mnesia_sup.erl')
-rw-r--r--lib/mnesia/src/mnesia_sup.erl13
1 files changed, 1 insertions, 12 deletions
diff --git a/lib/mnesia/src/mnesia_sup.erl b/lib/mnesia/src/mnesia_sup.erl
index 9ee4086f50..ef858d2364 100644
--- a/lib/mnesia/src/mnesia_sup.erl
+++ b/lib/mnesia/src/mnesia_sup.erl
@@ -60,9 +60,8 @@ init() ->
Event = event_procs(),
Kernel = kernel_procs(),
- Mnemosyne = mnemosyne_procs(),
- {ok, {Flags, Event ++ Kernel ++ Mnemosyne}}.
+ {ok, {Flags, Event ++ Kernel}}.
event_procs() ->
KillAfter = timer:seconds(30),
@@ -75,16 +74,6 @@ kernel_procs() ->
KA = infinity,
[{K, {K, start, []}, permanent, KA, supervisor, [K, supervisor]}].
-mnemosyne_procs() ->
- case mnesia_monitor:get_env(embedded_mnemosyne) of
- true ->
- Q = mnemosyne_sup,
- KA = infinity,
- [{Q, {Q, start, []}, permanent, KA, supervisor, [Q, supervisor]}];
- false ->
- []
- end.
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% event handler