From 95a7cca40ae52f32b9eb4f0664857e804636ec2c Mon Sep 17 00:00:00 2001
From: Dan Gudmundsson <dgud@erlang.org>
Date: Thu, 27 Oct 2011 11:06:38 +0200
Subject: [mnesia] Remove export of clear_table which is not a schema operation
 anymore

---
 lib/mnesia/src/mnesia_schema.erl              | 6 +-----
 lib/mnesia/test/mnesia_evil_backup.erl        | 8 ++++----
 lib/mnesia/test/mnesia_evil_coverage_test.erl | 4 ++--
 3 files changed, 7 insertions(+), 11 deletions(-)

(limited to 'lib')

diff --git a/lib/mnesia/src/mnesia_schema.erl b/lib/mnesia/src/mnesia_schema.erl
index 05be474aea..5660ac8019 100644
--- a/lib/mnesia/src/mnesia_schema.erl
+++ b/lib/mnesia/src/mnesia_schema.erl
@@ -39,7 +39,7 @@
          change_table_load_order/2,
 	 change_table_majority/2,
 	 change_table_frag/2,
-	 clear_table/1,
+%%	 clear_table/1,  %% removed since it is not a schema op anymore
          create_table/1,
 	 cs2list/1,
          del_snmp/1,
@@ -1152,10 +1152,6 @@ do_change_table_frag(Tab, _Change) ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Clear a table
 
-%% No need for a schema transaction
-clear_table(Tab) ->
-    schema_transaction(fun() -> do_clear_table(Tab) end).
-
 do_clear_table(schema) ->
     mnesia:abort({bad_type, schema});
 do_clear_table(Tab) ->
diff --git a/lib/mnesia/test/mnesia_evil_backup.erl b/lib/mnesia/test/mnesia_evil_backup.erl
index 63f4146d98..9e0a8db1ae 100644
--- a/lib/mnesia/test/mnesia_evil_backup.erl
+++ b/lib/mnesia/test/mnesia_evil_backup.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1998-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2011. All Rights Reserved.
 %%
 %% 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
@@ -244,9 +244,9 @@ restore(Config, Op)  ->
     [rpc:call(Node, ?MODULE, check_tab, [Res31, ?LINE]) || Node <- Nodes],
 
     %% Restore all tables on it's nodes
-    mnesia_schema:clear_table(Tab1),
-    mnesia_schema:clear_table(Tab2),
-    mnesia_schema:clear_table(Tab3),
+    mnesia:clear_table(Tab1),
+    mnesia:clear_table(Tab2),
+    mnesia:clear_table(Tab3),
     [mnesia:dirty_write({Tab1, N, N+1}) || N <- lists:seq(1, 11)],
     [mnesia:dirty_write({Tab2, N, N+1}) || N <- lists:seq(1, 11)],
     [mnesia:dirty_write({Tab3, N, N+1}) || N <- lists:seq(1, 11)],
diff --git a/lib/mnesia/test/mnesia_evil_coverage_test.erl b/lib/mnesia/test/mnesia_evil_coverage_test.erl
index 668eba176f..17d6c6c212 100644
--- a/lib/mnesia/test/mnesia_evil_coverage_test.erl
+++ b/lib/mnesia/test/mnesia_evil_coverage_test.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2011. All Rights Reserved.
 %%
 %% 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
@@ -1795,7 +1795,7 @@ subscribe_extended(Config) when is_list(Config) ->
     ?match({mnesia_table_event, {delete, schema, {schema, Tab1}, [{schema, Tab1, _}],_}}, recv_event()),
     ?match({mnesia_table_event, {write, schema, {schema, Tab1, _}, [], _}}, recv_event()),
 
-    ?match({atomic, ok}, mnesia_schema:clear_table(Tab2)),
+    ?match({atomic, ok}, mnesia:clear_table(Tab2)),
     ?match({mnesia_table_event, {delete, schema, {schema, Tab2}, [{schema, Tab2, _}],_}}, 
 	   recv_event()),
     ?match({mnesia_table_event, {write, schema, {schema, Tab2, _}, [], _}}, recv_event()),
-- 
cgit v1.2.3