Remove what remains of the Mnemosyne code

8 files changed, 3 insertions, 83 deletions

diff --git a/lib/mnesia/include/mnemosyne.hrl b/lib/mnesia/include/mnemosyne.hrl
deleted file mode 100644
index eb6ec53ae1..0000000000
--- a/lib/mnesia/include/mnemosyne.hrl
+++ /dev/null
@@ -1,18 +0,0 @@
-%% ``The contents of this file are subject to the Erlang Public License,
-%% Version 1.1, (the "License"); you may not use this file except in
-%% compliance with the License. You should have received a copy of the
-%% Erlang Public License along with this software. If not, it can be
-%% retrieved via the world wide web at http://www.erlang.org/.
-%% 
-%% Software distributed under the License is distributed on an "AS IS"
-%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-%% the License for the specific language governing rights and limitations
-%% under the License.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id$
-%%
--compile({parse_transform,mnemosyne}).
diff --git a/lib/mnesia/src/mnesia.erl b/lib/mnesia/src/mnesia.erl
index 3d30debc53..3488d5c99b 100644
--- a/lib/mnesia/src/mnesia.erl
+++ b/lib/mnesia/src/mnesia.erl
@@ -2186,7 +2186,6 @@ system_info2(dump_log_time_threshold) -> mnesia_monitor:get_env(dump_log_time_th
 system_info2(dump_log_update_in_place) ->
     mnesia_monitor:get_env(dump_log_update_in_place);
 system_info2(max_wait_for_decision) -> mnesia_monitor:get_env(max_wait_for_decision);
-system_info2(embedded_mnemosyne) -> mnesia_monitor:get_env(embedded_mnemosyne);
 system_info2(ignore_fallback_at_startup) -> mnesia_monitor:get_env(ignore_fallback_at_startup);
 system_info2(fallback_error_function) ->  mnesia_monitor:get_env(fallback_error_function);
 system_info2(log_version) -> mnesia_log:version();
@@ -2224,7 +2223,6 @@ system_info_items(yes) ->
      dump_log_time_threshold,
      dump_log_update_in_place,
      dump_log_write_threshold,
-     embedded_mnemosyne,
      event_module,
      extra_db_nodes,
      fallback_activated,
diff --git a/lib/mnesia/src/mnesia_monitor.erl b/lib/mnesia/src/mnesia_monitor.erl
index c08bbc879f..d940bd1cb7 100644
--- a/lib/mnesia/src/mnesia_monitor.erl
+++ b/lib/mnesia/src/mnesia_monitor.erl
@@ -673,7 +673,6 @@ env() ->
      dump_log_time_threshold,
      dump_log_update_in_place,
      dump_log_write_threshold,
-     embedded_mnemosyne,
      event_module,
      extra_db_nodes,
      ignore_fallback_at_startup,
@@ -706,8 +705,6 @@ default_env(dump_log_update_in_place) ->
     true;
 default_env(dump_log_write_threshold) ->
     1000;
-default_env(embedded_mnemosyne) ->
-    false;
 default_env(event_module) ->
     mnesia_event;
 default_env(extra_db_nodes) ->
@@ -757,7 +754,6 @@ do_check_type(event_module, A) when is_atom(A) -> A;
 do_check_type(ignore_fallback_at_startup, B) -> bool(B);
 do_check_type(fallback_error_function, {Mod, Func})
   when is_atom(Mod), is_atom(Func) -> {Mod, Func};
-do_check_type(embedded_mnemosyne, B) -> bool(B);
 do_check_type(extra_db_nodes, L) when is_list(L) ->
     Fun = fun(N) when N == node() -> false;
 	     (A) when is_atom(A) -> true
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
 
diff --git a/lib/mnesia/test/mnesia.spec b/lib/mnesia/test/mnesia.spec
index 204d1519cb..653e515317 100644
--- a/lib/mnesia/test/mnesia.spec
+++ b/lib/mnesia/test/mnesia.spec
@@ -42,9 +42,6 @@
 {skip_cases,"../mnesia_test",mnesia_measure_test,
             [measure_all_api_functions],
             "Not yet implemented"}.
-{skip_cases,"../mnesia_test",mnesia_measure_test,
-            [mnemosyne_vs_mnesia_kernel],
-            "Not yet implemented"}.
 {skip_cases,"../mnesia_test",mnesia_examples_test,
             [company],
             "Not yet implemented"}.
diff --git a/lib/mnesia/test/mnesia_SUITE.erl b/lib/mnesia/test/mnesia_SUITE.erl
index 2267a94164..5dbb80d4eb 100644
--- a/lib/mnesia/test/mnesia_SUITE.erl
+++ b/lib/mnesia/test/mnesia_SUITE.erl
@@ -105,7 +105,6 @@ groups() ->
      {otp_r4b, [],
       [{mnesia_config_test, access_module},
        {mnesia_config_test, dump_log_load_regulation},
-       {mnesia_config_test, embedded_mnemosyne},
        {mnesia_config_test, ignore_fallback_at_startup},
        {mnesia_config_test, max_wait_for_decision},
        {mnesia_consistency_test, consistency_after_restore},
diff --git a/lib/mnesia/test/mnesia_config_test.erl b/lib/mnesia/test/mnesia_config_test.erl
index 93510d539c..fd294780da 100644
--- a/lib/mnesia/test/mnesia_config_test.erl
+++ b/lib/mnesia/test/mnesia_config_test.erl
@@ -36,7 +36,6 @@
 	 dump_log_load_regulation/1,
 	
 	 dump_log_update_in_place/1,
-	 embedded_mnemosyne/1,
 	 event_module/1,
 	 ignore_fallback_at_startup/1,
 	 inconsistent_database/1,
@@ -104,7 +103,7 @@ end_per_testcase(Func, Conf) ->
 all() -> 
     [access_module, auto_repair, backup_module, debug, dir,
      dump_log_load_regulation, {group, dump_log_thresholds},
-     dump_log_update_in_place, embedded_mnemosyne,
+     dump_log_update_in_place,
      event_module, ignore_fallback_at_startup,
      inconsistent_database, max_wait_for_decision,
      send_compressed, app_test, {group, schema_config},
@@ -610,45 +609,6 @@ dump_log_load_regulation(Config) when is_list(Config) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-embedded_mnemosyne(doc) ->
-    ["Start Mnemosyne as an embedded part of Mnesia",
-     "on some of the nodes"];
-embedded_mnemosyne(suite) ->
-    [];
-embedded_mnemosyne(Config) when is_list(Config) ->
-    Nodes = ?acquire_nodes(1, Config),
-    Param = embedded_mnemosyne,
-
-    %% Normal 
-    NoMnem = false,
-    ?match(NoMnem, mnesia:system_info(Param)),
-    ?match(undefined, whereis(mnemosyne_catalog)),
-    ?match([], mnesia_test_lib:stop_mnesia(Nodes)),
-
-    %% Bad
-    Bad = arne_anka,
-    ?match({error, {bad_type, Param, Bad}},
-	   mnesia:start([{Param, Bad}])),
-
-    case code:priv_dir(mnemosyne) of
-	{error, _} -> %% No mnemosyne on later systems
-	    ok;
-	_ ->
-	    %% Mnemosyne as embedded application
-	    Mnem = true,
-	    ?match(undefined, whereis(mnemosyne_catalog)),
-	    ?match(ok,mnesia:start([{Param, Mnem}])),
-	    ?match(Mnem, mnesia:system_info(Param)),
-	    ?match(Pid when is_pid(Pid), whereis(mnemosyne_catalog)),
-	    ?match([], mnesia_test_lib:stop_mnesia(Nodes)),
-	    ?match(undefined, whereis(mnemosyne_catalog))
-    end,
-    ?verify_mnesia([], Nodes),
-    ?cleanup(1, Config),
-    ok.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
 ignore_fallback_at_startup(doc) ->
     ["Start Mnesia without rollback of the database to the fallback. ",
      "Once Mnesia has been (re)started the installed fallback should",
diff --git a/lib/mnesia/test/mnesia_measure_test.erl b/lib/mnesia/test/mnesia_measure_test.erl
index e63689d83a..dfed302814 100644
--- a/lib/mnesia/test/mnesia_measure_test.erl
+++ b/lib/mnesia/test/mnesia_measure_test.erl
@@ -72,8 +72,7 @@ groups() ->
        resource_consumption_at_full_load]},
      {benchmarks, [],
       [{group, meter}, cost, dbn_meters,
-       measure_all_api_functions, {group, tpcb},
-       mnemosyne_vs_mnesia_kernel]},
+       measure_all_api_functions, {group, tpcb}]},
      {tpcb, [], [ram_tpcb, disc_tpcb, disc_only_tpcb]},
      {meter, [], [ram_meter, disc_meter, disc_only_meter]}].