4 files changed, 14 insertions, 5 deletions
diff --git a/lib/mnesia/src/mnesia_dumper.erl b/lib/mnesia/src/mnesia_dumper.erl
index daa9e6aff2..f8d7664156 100644
--- a/lib/mnesia/src/mnesia_dumper.erl
+++ b/lib/mnesia/src/mnesia_dumper.erl
@@ -364,7 +364,7 @@ dets_insert(Op,Tab,Key,Val) ->
 	    ok = dets:delete_object(Tab, Val);
 	clear_table ->
 	    dets_cleared(Tab),
-	    ok = dets:match_delete(Tab, '_')
+	    ok = dets:delete_all_objects(Tab)
     end.
 	    
 dets_updated(Tab,Key) -> 
diff --git a/lib/mnesia/src/mnesia_lib.erl b/lib/mnesia/src/mnesia_lib.erl
index 775d370d0f..ae6631646c 100644
--- a/lib/mnesia/src/mnesia_lib.erl
+++ b/lib/mnesia/src/mnesia_lib.erl
@@ -1141,12 +1141,18 @@ db_erase(ram_copies, Tab, Key) -> ?ets_delete(Tab, Key), ok;
 db_erase(disc_copies, Tab, Key) -> ?ets_delete(Tab, Key), ok;
 db_erase(disc_only_copies, Tab, Key) -> dets:delete(Tab, Key).
 
+db_match_erase(Tab, '_') ->
+    db_delete_all(val({Tab, storage_type}),Tab);
 db_match_erase(Tab, Pat) ->
     db_match_erase(val({Tab, storage_type}), Tab, Pat).
 db_match_erase(ram_copies, Tab, Pat) -> ?ets_match_delete(Tab, Pat), ok;
 db_match_erase(disc_copies, Tab, Pat) -> ?ets_match_delete(Tab, Pat), ok;
 db_match_erase(disc_only_copies, Tab, Pat) -> dets:match_delete(Tab, Pat).
 
+db_delete_all(ram_copies, Tab) ->       ets:delete_all_objects(Tab);
+db_delete_all(disc_copies, Tab) ->      ets:delete_all_objects(Tab);
+db_delete_all(disc_only_copies, Tab) -> dets:delete_all_objects(Tab).
+
 db_first(Tab) ->
     db_first(val({Tab, storage_type}), Tab).
 db_first(ram_copies, Tab) -> ?ets_first(Tab);
diff --git a/lib/mnesia/src/mnesia_log.erl b/lib/mnesia/src/mnesia_log.erl
index 9e804cc4c2..94153473cb 100644
--- a/lib/mnesia/src/mnesia_log.erl
+++ b/lib/mnesia/src/mnesia_log.erl
@@ -1021,7 +1021,8 @@ add_recs([LogH|Rest], N)
        LogH#log_header.log_version >= "1.0" ->    
     add_recs(Rest, N);
 add_recs([{{Tab, _Key}, _Val, clear_table} | Rest], N) ->
-    true = ets:match_delete(Tab, '_'),
-    add_recs(Rest, N+ets:info(Tab, size));  
+    Size = ets:info(Tab, size),
+    true = ets:delete_all_objects(Tab),
+    add_recs(Rest, N+Size);
 add_recs([], N) ->
     N.
diff --git a/lib/mnesia/src/mnesia_recover.erl b/lib/mnesia/src/mnesia_recover.erl
index b3eed1de6e..4750291a10 100644
--- a/lib/mnesia/src/mnesia_recover.erl
+++ b/lib/mnesia/src/mnesia_recover.erl
@@ -227,11 +227,13 @@ do_log_decision(D, DoTell, NodeD) ->
     note_outcome(D2),
     case mnesia_monitor:use_dir() of
 	true ->
-	    mnesia_log:append(latest_log, D2),
 	    if
 		DoTell == true, Outcome /= unclear ->
 		    tell_im_certain(NodeD#decision.disc_nodes--[node()],D2),
-		    tell_im_certain(NodeD#decision.ram_nodes--[node()], D2);
+		    tell_im_certain(NodeD#decision.ram_nodes--[node()], D2),
+		    mnesia_log:log(D2);
+		Outcome /= unclear ->
+		    mnesia_log:log(D2);
 		true ->
 		    ignore
 	    end;