Merge branch 'dgud/mnesia/ext-backend/PR-858/OTP-13058'

* dgud/mnesia/ext-backend/PR-858/OTP-13058:
  mnesia_ext: Add basic backend extension tests
  mnesia_ext: reuse snmp field for ext updates
  mnesia_ext: Create table/data containers from mnesia monitor not temporary processes
  mnesia_ext: Implement ext copies index
  mnesia_ext: Load table ext
  mnesia_ext: Dumper and schema changes
  mnesia_ext: Refactor mnesia_schema.erl
  mnesia_ext: Ext support in fragmented tables
  mnesia_ext: Backup handling
  mnesia_ext: Create schema functionality
  mnesia_ext: Add ext copies and db_fold to low level api
  mnesia_ext: Refactor record_validation code
  mnesia_ext: Add create_external and increase protocol version to monitor
  mnesia_ext: Add ext copies to records
  mnesia_ext: Add supervisor and behaviour modules

9 files changed, 406 insertions, 100 deletions

diff --git a/lib/mnesia/test/Makefile b/lib/mnesia/test/Makefile
index f0efbe6375..5b61b1af65 100644
--- a/lib/mnesia/test/Makefile
+++ b/lib/mnesia/test/Makefile
@@ -52,7 +52,8 @@ MODULES= \
 	mnesia_schema_recovery_test \
 	mnesia_measure_test \
 	mnesia_cost \
-	mnesia_dbn_meters 
+	mnesia_dbn_meters \
+	ext_test
 
 DocExamplesDir := ../doc/src/
 
diff --git a/lib/mnesia/test/ext_test.erl b/lib/mnesia/test/ext_test.erl
new file mode 100644
index 0000000000..45ddb148bc
--- /dev/null
+++ b/lib/mnesia/test/ext_test.erl
@@ -0,0 +1,237 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 1996-2014. All Rights Reserved.
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%
+%% %CopyrightEnd%
+%%
+
+-module(ext_test).
+
+%% Initializations
+-export([init_backend/0, add_aliases/1, remove_aliases/1,
+	 check_definition/4, semantics/2]).
+
+-export([
+	 create_table/3, load_table/4,
+	 delete_table/2, close_table/2, sync_close_table/2,
+
+	 sender_init/4,
+	 receiver_first_message/4, receive_data/5, receive_done/4,
+
+	 index_is_consistent/3, is_index_consistent/2,
+
+	 real_suffixes/0, tmp_suffixes/0,
+
+	 info/3,
+	 fixtable/3,
+	 validate_key/6, validate_record/6,
+
+	 first/2, last/2, next/3, prev/3, slot/3,
+
+	 insert/3, update_counter/4,
+	 lookup/3,
+	 delete/3, match_delete/3,
+	 select/1, select/3, select/4, repair_continuation/2
+	]).
+
+-ifdef(DEBUG).
+-define(DBG(DATA), io:format("~p:~p: ~p~n",[?MODULE, ?LINE, DATA])).
+-define(DBG(FORMAT, ARGS), io:format("~p:~p: " ++ FORMAT,[?MODULE, ?LINE] ++ ARGS)).
+-else.
+-define(DBG(DATA), ok).
+-define(DBG(FORMAT, ARGS), ok).
+-endif.
+
+%% types() ->
+%%     [{fs_copies, ?MODULE},
+%%      {raw_fs_copies, ?MODULE}].
+
+semantics(ext_ets, storage) -> ram_copies;
+semantics(ext_ets, types  ) -> [set, ordered_set, bag];
+semantics(ext_ets, index_types) -> [ordered];
+semantics(_Alias, _) ->
+    undefined.
+
+%% valid_op(_, _) ->
+%%     true.
+
+init_backend() ->
+    ?DBG(init_backend),
+    ok.
+
+add_aliases(_As) ->
+    ?DBG(_As),
+    ok.
+
+remove_aliases(_) ->
+    ok.
+
+
+%% Table operations
+
+check_definition(ext_ets, _Tab, _Nodes, _Props) ->
+    ?DBG("~p ~p ~p~n", [_Tab, _Nodes, _Props]),
+    ok.
+
+create_table(ext_ets, Tab, Props) when is_atom(Tab) ->
+    Tid = ets:new(Tab, [public, proplists:get_value(type, Props, set), {keypos, 2}]),
+    ?DBG("~p Create: ~p(~p) ~p~n", [self(), Tab, Tid, Props]),
+    mnesia_lib:set({?MODULE, Tab}, Tid),
+    ok;
+create_table(_, Tag={Tab, index, {_Where, Type0}}, _Opts) ->
+    Type = case Type0 of
+	       ordered -> ordered_set;
+	       _ -> Type0
+	   end,
+    Tid = ets:new(Tab, [public, Type]),
+    ?DBG("~p(~p) ~p~n", [Tab, Tid, Tag]),
+    mnesia_lib:set({?MODULE, Tag}, Tid),
+    ok;
+create_table(_, Tag={_Tab, retainer, ChkPName}, _Opts) ->
+    Tid = ets:new(ChkPName, [set, public, {keypos, 2}]),
+    ?DBG("~p(~p) ~p~n", [_Tab, Tid, Tag]),
+    mnesia_lib:set({?MODULE, Tag}, Tid),
+    ok.
+
+delete_table(ext_ets, Tab) ->
+    try
+      ets:delete(mnesia_lib:val({?MODULE,Tab})),
+      mnesia_lib:unset({?MODULE,Tab}),
+      ok
+    catch _:_ ->
+	    ?DBG({double_delete, Tab}),
+	    ok
+    end.
+
+load_table(ext_ets, _Tab, init_index, _Cs) -> ok;
+load_table(ext_ets, _Tab, _LoadReason, _Cs) ->
+    ?DBG("Load ~p ~p~n", [_Tab, _LoadReason]),
+    ok.
+%%     mnesia_monitor:unsafe_create_external(Tab, ext_ets, ?MODULE, Cs).
+
+sender_init(Alias, Tab, _RemoteStorage, _Pid) ->
+    KeysPerTransfer = 100,
+    {standard,
+     fun() -> mnesia_lib:db_init_chunk({ext,Alias,?MODULE}, Tab, KeysPerTransfer) end,
+     fun(Cont) -> mnesia_lib:db_chunk({ext,Alias,?MODULE}, Cont) end}.
+
+receiver_first_message(Sender, {first, Size}, _Alias, Tab) ->
+    ?DBG({first,Size}),
+    {Size, {Tab, Sender}}.
+
+receive_data(Data, ext_ets, Name, _Sender, {Name, Tab, _Sender}=State) ->
+    ?DBG({Data,State}),
+    true = ets:insert(Tab, Data),
+    {more, State};
+receive_data(Data, Alias, Tab, Sender, {Name, Sender}) ->
+    receive_data(Data, Alias, Tab, Sender, {Name, mnesia_lib:val({?MODULE,Tab}), Sender}).
+
+receive_done(_Alias, _Tab, _Sender, _State) ->
+    ?DBG({done,_State}),
+    ok.
+
+close_table(Alias, Tab) -> sync_close_table(Alias, Tab).
+
+sync_close_table(ext_ets, _Tab) ->
+    ?DBG(_Tab).
+
+fixtable(ext_ets, Tab, Bool) ->
+    ?DBG({Tab,Bool}),
+    ets:safe_fixtable(mnesia_lib:val({?MODULE,Tab}), Bool).
+
+info(ext_ets, Tab, Type) ->
+    ?DBG({Tab,Type}),
+    Tid = mnesia_lib:val({?MODULE,Tab}),
+    try ets:info(Tid, Type) of
+	Val -> Val
+    catch _:_ ->
+	    undefined
+    end.
+
+real_suffixes() ->
+    [".dat"].
+
+tmp_suffixes() ->
+    [].
+
+%% Index
+
+index_is_consistent(_Alias, _Ix, _Bool) -> ok.  % Ignore for now
+is_index_consistent(_Alias, _Ix) -> false.      % Always rebuild
+
+%% Record operations
+
+validate_record(_Alias, _Tab, RecName, Arity, Type, _Obj) ->
+    {RecName, Arity, Type}.
+
+validate_key(_Alias, _Tab, RecName, Arity, Type, _Key) ->
+    {RecName, Arity, Type}.
+
+insert(ext_ets, Tab, Obj) ->
+    ?DBG({Tab,Obj}),
+    try
+	ets:insert(mnesia_lib:val({?MODULE,Tab}), Obj),
+	ok
+    catch _:Reason ->
+	    io:format("CRASH ~p ~p~n",[Reason, mnesia_lib:val({?MODULE,Tab})])
+    end.
+
+lookup(ext_ets, Tab, Key) ->
+    ets:lookup(mnesia_lib:val({?MODULE,Tab}), Key).
+
+delete(ext_ets, Tab, Key) ->
+    ets:delete(mnesia_lib:val({?MODULE,Tab}), Key).
+
+match_delete(ext_ets, Tab, Pat) ->
+    ets:match_delete(mnesia_lib:val({?MODULE,Tab}), Pat).
+
+first(ext_ets, Tab) ->
+    ets:first(mnesia_lib:val({?MODULE,Tab})).
+
+last(Alias, Tab) -> first(Alias, Tab).
+
+next(ext_ets, Tab, Key) ->
+    ets:next(mnesia_lib:val({?MODULE,Tab}), Key).
+
+prev(Alias, Tab, Key) ->
+    next(Alias, Tab, Key).
+
+slot(ext_ets, Tab, Pos) ->
+    ets:slot(mnesia_lib:val({?MODULE,Tab}), Pos).
+
+update_counter(ext_ets, Tab, C, Val) ->
+    ets:update_counter(mnesia_lib:val({?MODULE,Tab}), C, Val).
+
+select('$end_of_table' = End) -> End;
+select({ext_ets, C}) ->  ets:select(C).
+
+select(Alias, Tab, Ms) ->
+    Res = select(Alias, Tab, Ms, 100000),
+    select_1(Res).
+
+select_1('$end_of_table') -> [];
+select_1({Acc, C}) ->
+    case ets:select(C) of
+	'$end_of_table' -> Acc;
+	{New, Cont} ->
+	    select_1({New ++ Acc, Cont})
+    end.
+
+select(ext_ets, Tab, Ms, Limit) when is_integer(Limit); Limit =:= infinity ->
+    ets:select(mnesia_lib:val({?MODULE,Tab}), Ms, Limit).
+
+repair_continuation({Alias, Cont}, Ms) ->
+    {Alias, ets:repair_continuation(Cont, Ms)}.
diff --git a/lib/mnesia/test/mnesia_config_test.erl b/lib/mnesia/test/mnesia_config_test.erl
index 204b8fa394..45da909264 100644
--- a/lib/mnesia/test/mnesia_config_test.erl
+++ b/lib/mnesia/test/mnesia_config_test.erl
@@ -1100,8 +1100,8 @@ dynamic_basic(Config) when is_list(Config) ->
 
     ?match(ok, mnesia:dirty_write({tab1, 1, 1})),
     ?match(ok, mnesia:dirty_write({tab2, 1, 1})),
-   
-    ?match(ok, rpc:call(N2, mnesia, start, [[{extra_db_nodes, [N1]}]])),
+
+    ?match(ok, rpc:call(N2, mnesia, start, [[{extra_db_nodes, [N1]}, {schema, ?BACKEND}]])),
     ?match(ok, rpc:call(N2, mnesia, wait_for_tables, [[tab1,tab2],5000])),
     io:format("Here ~p ~n",[?LINE]), 
     check_storage(N2, N1, [N3]),
@@ -1112,7 +1112,7 @@ dynamic_basic(Config) when is_list(Config) ->
     ?match(ok, mnesia:delete_schema([N3])),
     
     io:format("T1 ~p ~n",[rpc:call(N3,?MODULE,c_nodes,[])]),
-    ?match(ok, rpc:call(N3, mnesia, start, [])),
+    ?match(ok, rpc:call(N3, mnesia, start, [[{schema, ?BACKEND}]])),
     io:format("T2 ~p ~n",[rpc:call(N3,?MODULE,c_nodes,[])]),
     timer:sleep(2000),
     io:format("T3 ~p ~n",[rpc:call(N3,?MODULE,c_nodes,[])]),
@@ -1127,7 +1127,7 @@ dynamic_basic(Config) when is_list(Config) ->
     ?match([], mnesia_test_lib:kill_mnesia([N3])),
     ?match(ok, mnesia:delete_schema([N3])),
     
-    ?match(ok, rpc:call(N3, mnesia, start, [])),
+    ?match(ok, rpc:call(N3, mnesia, start, [[{schema, ?BACKEND}]])),
     ?match({ok, [N3]}, sort(?rpc_connect(N1, [N3]))),
     ?match(ok, rpc:call(N3, mnesia, wait_for_tables, [[tab1,tab2],5000])),
     io:format("Here ~p ~n",[?LINE]), 
@@ -1143,7 +1143,7 @@ dynamic_basic(Config) when is_list(Config) ->
     % mnesia should come up now.
     ?match({atomic, ok}, mnesia:add_table_copy(tab1, N2, ram_copies)),
 
-    ?match(ok, rpc:call(N2, mnesia, start, [])),
+    ?match(ok, rpc:call(N2, mnesia, start, [[{schema, ?BACKEND}]])),
     ?match({ok, _}, sort(?rpc_connect(N2, [N3]))),
     
     ?match(SNs, sort(rpc:call(N1, mnesia, system_info, [running_db_nodes]))),
@@ -1162,7 +1162,7 @@ dynamic_basic(Config) when is_list(Config) ->
     ?match([N3,N1], sort(rpc:call(N1, mnesia, system_info, [running_db_nodes]))),
     ?match([N3,N1], sort(rpc:call(N3, mnesia, system_info, [running_db_nodes]))),
     
-    ?match(ok, rpc:call(N2, mnesia, start, [])),
+    ?match(ok, rpc:call(N2, mnesia, start, [[{schema, ?BACKEND}]])),
     ?match({ok, _}, sort(?rpc_connect(N3, [N2]))),
     
     ?match(SNs, sort(rpc:call(N1, mnesia, system_info, [running_db_nodes]))),
@@ -1192,7 +1192,7 @@ dynamic_ext(Config) when is_list(Config) ->
     
     mnesia_test_lib:kill_mnesia([N2]),
     ?match(ok, mnesia:delete_schema([N2])),
-    ?match(ok, rpc:call(N2, mnesia, start, [[{extra_db_nodes, [N1]}]])),
+    ?match(ok, rpc:call(N2, mnesia, start, [[{extra_db_nodes, [N1]}, {schema, ?BACKEND}]])),
     
     ?match(SNs, sort(rpc:call(N1, mnesia, system_info, [running_db_nodes]))),
     ?match(SNs, sort(rpc:call(N2, mnesia, system_info, [running_db_nodes]))),
@@ -1213,7 +1213,7 @@ dynamic_ext(Config) when is_list(Config) ->
     ?match(ok, mnesia:dirty_write({tab3, 42, T})),
     
     ?match(stopped, rpc:call(N2, mnesia, stop, [])),
-    ?match(ok, rpc:call(N2, mnesia, start, [])),
+    ?match(ok, rpc:call(N2, mnesia, start, [[{schema, ?BACKEND}]])),
     ?match(SNs, sort(rpc:call(N2, mnesia, system_info, [running_db_nodes]))),
     ?match(ok, mnesia:wait_for_tables([tab0,tab1,tab2,tab3], 10000)),
     ?match(ok, rpc:call(N2, mnesia, wait_for_tables, [[tab1,tab2,tab3], 100])),
@@ -1226,7 +1226,7 @@ dynamic_ext(Config) when is_list(Config) ->
 
     ?match(stopped, rpc:call(N1, mnesia, stop, [])),
 
-    ?match(ok, rpc:call(N2, mnesia, start, [[{extra_db_nodes,[N1,N2]}]])),
+    ?match(ok, rpc:call(N2, mnesia, start, [[{extra_db_nodes,[N1,N2]}, {schema, ?BACKEND}]])),
     ?match({timeout,[tab0]}, rpc:call(N2, mnesia, wait_for_tables, [[tab0], 500])),
 
     ?match(ok, rpc:call(N1, mnesia, start, [[{extra_db_nodes, [N1,N2]}]])),
@@ -1238,7 +1238,7 @@ dynamic_ext(Config) when is_list(Config) ->
     ?match(stopped, rpc:call(N1, mnesia, stop, [])),
     mnesia_test_lib:kill_mnesia([N2]),
     ?match(ok, mnesia:delete_schema([N2])),
-    ?match(ok, rpc:call(N1, mnesia, start, [[{extra_db_nodes, [N1,N2]}]])),   
+    ?match(ok, rpc:call(N1, mnesia, start, [[{extra_db_nodes, [N1,N2]}, {schema, ?BACKEND}]])),
     ?match({timeout,[tab0]}, rpc:call(N1, mnesia, wait_for_tables, [[tab0], 500])),
 
     ?match(ok, rpc:call(N2, mnesia, start, [[{extra_db_nodes,[N1,N2]}]])),
diff --git a/lib/mnesia/test/mnesia_dirty_access_test.erl b/lib/mnesia/test/mnesia_dirty_access_test.erl
index 88b3a215e1..c9df8ed353 100644
--- a/lib/mnesia/test/mnesia_dirty_access_test.erl
+++ b/lib/mnesia/test/mnesia_dirty_access_test.erl
@@ -40,43 +40,40 @@ all() ->
 
 groups() -> 
     [{dirty_write, [],
-      [dirty_write_ram, dirty_write_disc,
-       dirty_write_disc_only]},
+      [dirty_write_ram, dirty_write_disc, dirty_write_disc_only,
+       dirty_write_xets]},
      {dirty_read, [],
-      [dirty_read_ram, dirty_read_disc,
-       dirty_read_disc_only]},
+      [dirty_read_ram, dirty_read_disc, dirty_read_disc_only, dirty_read_xets]},
      {dirty_update_counter, [],
       [dirty_update_counter_ram, dirty_update_counter_disc,
-       dirty_update_counter_disc_only]},
+       dirty_update_counter_disc_only, dirty_update_counter_xets]},
      {dirty_delete, [],
       [dirty_delete_ram, dirty_delete_disc,
-       dirty_delete_disc_only]},
+       dirty_delete_disc_only, dirty_delete_xets]},
      {dirty_delete_object, [],
       [dirty_delete_object_ram, dirty_delete_object_disc,
-       dirty_delete_object_disc_only]},
+       dirty_delete_object_disc_only, dirty_delete_object_xets]},
      {dirty_match_object, [],
       [dirty_match_object_ram, dirty_match_object_disc,
-       dirty_match_object_disc_only]},
+       dirty_match_object_disc_only, dirty_match_object_xets]},
      {dirty_index, [],
       [{group, dirty_index_match_object},
        {group, dirty_index_read},
        {group, dirty_index_update}]},
      {dirty_index_match_object, [],
-      [dirty_index_match_object_ram,
-       dirty_index_match_object_disc,
-       dirty_index_match_object_disc_only]},
+      [dirty_index_match_object_ram, dirty_index_match_object_disc,
+       dirty_index_match_object_disc_only, dirty_index_match_object_xets]},
      {dirty_index_read, [],
       [dirty_index_read_ram, dirty_index_read_disc,
-       dirty_index_read_disc_only]},
+       dirty_index_read_disc_only, dirty_index_read_xets]},
      {dirty_index_update, [],
-      [dirty_index_update_set_ram,
-       dirty_index_update_set_disc,
-       dirty_index_update_set_disc_only,
+      [dirty_index_update_set_ram,  dirty_index_update_set_disc,
+       dirty_index_update_set_disc_only,  dirty_index_update_set_xets,
        dirty_index_update_bag_ram, dirty_index_update_bag_disc,
-       dirty_index_update_bag_disc_only]},
+       dirty_index_update_bag_disc_only, dirty_index_update_bag_xets]},
      {dirty_iter, [],
-      [dirty_iter_ram, dirty_iter_disc,
-       dirty_iter_disc_only]},
+      [dirty_iter_ram, dirty_iter_disc, dirty_iter_disc_only,
+       dirty_iter_xets]},
      {admin_tests, [],
       [del_table_copy_1, del_table_copy_2, del_table_copy_3,
        add_table_copy_1, add_table_copy_2, add_table_copy_3,
@@ -106,6 +103,9 @@ dirty_write_disc_only(suite) -> [];
 dirty_write_disc_only(Config) when is_list(Config) ->
     dirty_write(Config, disc_only_copies).
 
+dirty_write_xets(Config) when is_list(Config) ->
+    dirty_write(Config, ext_ets).
+
 dirty_write(Config, Storage) ->
     [Node1] = Nodes = ?acquire_nodes(1, Config), 
     Tab = dirty_write, 
@@ -137,6 +137,9 @@ dirty_read_disc_only(suite) -> [];
 dirty_read_disc_only(Config) when is_list(Config) ->
     dirty_read(Config, disc_only_copies).
 
+dirty_read_xets(Config) when is_list(Config) ->
+    dirty_read(Config, ext_ets).
+
 dirty_read(Config, Storage) ->
     [Node1] = Nodes = ?acquire_nodes(1, Config), 
     Tab = dirty_read, 
@@ -180,6 +183,9 @@ dirty_update_counter_disc_only(suite) -> [];
 dirty_update_counter_disc_only(Config) when is_list(Config) ->
     dirty_update_counter(Config, disc_only_copies).
 
+dirty_update_counter_xets(Config) when is_list(Config) ->
+    dirty_update_counter(Config, ext_ets).
+
 dirty_update_counter(Config, Storage) ->
     [Node1] = Nodes = ?acquire_nodes(1, Config), 
     Tab = dirty_update_counter, 
@@ -222,6 +228,9 @@ dirty_delete_disc_only(suite) -> [];
 dirty_delete_disc_only(Config) when is_list(Config) ->
     dirty_delete(Config, disc_only_copies).
 
+dirty_delete_xets(Config) when is_list(Config) ->
+    dirty_delete(Config, ext_ets).
+
 dirty_delete(Config, Storage) ->
     [Node1] = Nodes = ?acquire_nodes(1, Config), 
     Tab = dirty_delete, 
@@ -259,6 +268,9 @@ dirty_delete_object_disc_only(suite) -> [];
 dirty_delete_object_disc_only(Config) when is_list(Config) ->
     dirty_delete_object(Config, disc_only_copies).
 
+dirty_delete_object_xets(Config) when is_list(Config) ->
+    dirty_delete_object(Config, ext_ets).
+
 dirty_delete_object(Config, Storage) ->
     [Node1] = Nodes = ?acquire_nodes(1, Config), 
     Tab = dirty_delete_object, 
@@ -302,6 +314,9 @@ dirty_match_object_disc_only(suite) -> [];
 dirty_match_object_disc_only(Config) when is_list(Config) ->
     dirty_match_object(Config, disc_only_copies).
 
+dirty_match_object_xets(Config) when is_list(Config) ->
+    dirty_match_object(Config, ext_ets).
+
 dirty_match_object(Config, Storage) ->
     [Node1] = Nodes = ?acquire_nodes(1, Config), 
     Tab = dirty_match, 
@@ -326,7 +341,6 @@ dirty_match_object(Config, Storage) ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Dirty read matching records by using an index
 
-
 dirty_index_match_object_ram(suite) -> [];
 dirty_index_match_object_ram(Config) when is_list(Config) ->
     dirty_index_match_object(Config, ram_copies).
@@ -339,6 +353,9 @@ dirty_index_match_object_disc_only(suite) -> [];
 dirty_index_match_object_disc_only(Config) when is_list(Config) ->
     dirty_index_match_object(Config, disc_only_copies).
 
+dirty_index_match_object_xets(Config) when is_list(Config) ->
+    dirty_index_match_object(Config, ext_ets).
+
 dirty_index_match_object(Config, Storage) ->
     [Node1] = Nodes = ?acquire_nodes(1, Config), 
     Tab = dirty_index_match_object, 
@@ -376,6 +393,9 @@ dirty_index_read_disc_only(suite) -> [];
 dirty_index_read_disc_only(Config) when is_list(Config) ->
     dirty_index_read(Config, disc_only_copies).
 
+dirty_index_read_xets(Config) when is_list(Config) ->
+    dirty_index_read(Config, ext_ets).
+
 dirty_index_read(Config, Storage) ->
     [Node1] = Nodes = ?acquire_nodes(1, Config), 
     Tab = dirty_index_read, 
@@ -437,6 +457,9 @@ dirty_index_update_set_disc_only(suite) -> [];
 dirty_index_update_set_disc_only(Config) when is_list(Config) ->
     dirty_index_update_set(Config, disc_only_copies).
 
+dirty_index_update_set_xets(Config) when is_list(Config) ->
+    dirty_index_update_set(Config, ext_ets).
+
 dirty_index_update_set(Config, Storage) ->
     [Node1] = Nodes = ?acquire_nodes(1, Config), 
     Tab = index_test, 
@@ -525,6 +548,9 @@ dirty_index_update_bag_disc_only(suite) -> [];
 dirty_index_update_bag_disc_only(Config)when is_list(Config) ->
     dirty_index_update_bag(Config, disc_only_copies).
 
+dirty_index_update_bag_xets(Config) when is_list(Config) ->
+    dirty_index_update_bag(Config, ext_ets).
+
 dirty_index_update_bag(Config, Storage) ->
     [Node1] = Nodes = ?acquire_nodes(1, Config), 
     Tab = index_test, 
@@ -631,7 +657,6 @@ dirty_index_update_bag(Config, Storage) ->
 %% Dirty iteration
 %% dirty_slot,  dirty_first,  dirty_next
 
-
 dirty_iter_ram(suite) -> [];
 dirty_iter_ram(Config) when is_list(Config) ->
     dirty_iter(Config, ram_copies).
@@ -644,6 +669,9 @@ dirty_iter_disc_only(suite) -> [];
 dirty_iter_disc_only(Config) when is_list(Config) ->
     dirty_iter(Config, disc_only_copies).
 
+dirty_iter_xets(Config) when is_list(Config) ->
+    dirty_iter(Config, ext_ets).
+
 dirty_iter(Config, Storage) ->
     [Node1] = Nodes = ?acquire_nodes(1, Config), 
     Tab = dirty_iter, 
diff --git a/lib/mnesia/test/mnesia_evil_coverage_test.erl b/lib/mnesia/test/mnesia_evil_coverage_test.erl
index 2ed62b1538..6e34040bc4 100644
--- a/lib/mnesia/test/mnesia_evil_coverage_test.erl
+++ b/lib/mnesia/test/mnesia_evil_coverage_test.erl
@@ -72,7 +72,9 @@ groups() ->
      {record_name_dirty_access, [],
       [record_name_dirty_access_ram,
        record_name_dirty_access_disc,
-       record_name_dirty_access_disc_only]}].
+       record_name_dirty_access_disc_only,
+       record_name_dirty_access_xets
+      ]}].
 
 init_per_group(_GroupName, Config) ->
     Config.
@@ -112,6 +114,7 @@ system_info(Config) when is_list(Config) ->
     ?match(I when is_integer(I), mnesia:system_info(transaction_log_writes)),
     ?match(I when is_integer(I), mnesia:system_info(send_compressed)),
     ?match(L when is_list(L), mnesia:system_info(all)),
+    ?match(L when is_list(L), mnesia:system_info(backend_types)),
     ?match({'EXIT', {aborted, Reason }} when element(1, Reason) == badarg
            , mnesia:system_info(ali_baba)),
     ?verify_mnesia(Nodes, []).
@@ -132,11 +135,11 @@ table_info(Config) when is_list(Config) ->
     Schema = 
 	case mnesia_test_lib:diskless(Config) of
 	    true -> [{type, Type}, {attributes, Attrs}, {index, [ValPos]},
-		     {ram_copies, Nodes}];
+		     {ram_copies, [Node1, Node2]}, {ext_ets, [Node3]}];
 	    false ->		
 		[{type, Type}, {attributes, Attrs}, {index, [ValPos]},
-		 {disc_only_copies, [Node1]}, {ram_copies, [Node2]}, 
-		 {disc_copies, [Node3]}]
+		 {disc_only_copies, [Node1]}, {ram_copies, [Node2]},
+		 {ext_ets, [Node3]}]
 	end,
     ?match({atomic, ok}, mnesia:create_table(Tab, Schema)),
 
@@ -144,28 +147,22 @@ table_info(Config) when is_list(Config) ->
     Keys = lists:seq(1, Size),
     Records = [{Tab, A, 7} || A <- Keys],
     lists:foreach(fun(Rec) -> ?match(ok, mnesia:dirty_write(Rec)) end, Records),
-    ?match(Mem when is_integer(Mem), mnesia:table_info(Tab, memory)),
-    ?match(Size, mnesia:table_info(Tab, size)),
-    ?match(Type, mnesia:table_info(Tab, type)),
 
     case mnesia_test_lib:diskless(Config) of
 	true -> 
 	    ?match(Nodes, mnesia:table_info(Tab, ram_copies));
 	false ->              
-	    ?match([Node3], mnesia:table_info(Tab, mnesia_test_lib:storage_type(disc_copies, Config))),
+	    ?match([Node3], mnesia:table_info(Tab, ext_ets)),
 	    ?match([Node2], mnesia:table_info(Tab, ram_copies)),
 	    ?match([Node1], mnesia:table_info(Tab, mnesia_test_lib:storage_type(disc_only_copies, Config)))
     end,
     Read = [Node1, Node2, Node3],
-    ?match(true, lists:member(mnesia:table_info(Tab, where_to_read), Read)),
     Write = ?sort([Node1, Node2, Node3]),
-    ?match(Write, ?sort(mnesia:table_info(Tab, where_to_write))),
-    ?match([ValPos], mnesia:table_info(Tab, index)),
-    ?match(Arity, mnesia:table_info(Tab, arity)),
-    ?match(Attrs, mnesia:table_info(Tab, attributes)),
-    ?match({Tab, '_', '_'}, mnesia:table_info(Tab, wild_pattern)),
-    ?match({atomic, Attrs}, mnesia:transaction(fun() ->
-						       mnesia:table_info(Tab, attributes) end)),
+
+    {[ok,ok,ok], []} = rpc:multicall(Nodes, ?MODULE, info_check,
+				     [Tab, Read, Write, Size, Type, ValPos, Arity, Attrs]),
+
+    ?match({atomic, Attrs}, mnesia:transaction(fun() -> mnesia:table_info(Tab, attributes) end)),
 
     ?match(L when is_list(L), mnesia:table_info(Tab, all)),
 
@@ -179,6 +176,17 @@ table_info(Config) when is_list(Config) ->
     ?match(0, mnesia:table_info(tab_info, size)),
     ?verify_mnesia([Node1, Node3], [Node2]).
 
+info_check(Tab, Read, Write, Size, Type, ValPos, Arity, Attrs) ->
+    ?match(true, lists:member(mnesia:table_info(Tab, where_to_read), Read)),
+    ?match(Write, ?sort(mnesia:table_info(Tab, where_to_write))),
+    ?match(Mem when is_integer(Mem), mnesia:table_info(Tab, memory)),
+    ?match(Size, mnesia:table_info(Tab, size)),
+    ?match(Type, mnesia:table_info(Tab, type)),
+    ?match([ValPos], mnesia:table_info(Tab, index)),
+    ?match(Arity, mnesia:table_info(Tab, arity)),
+    ?match(Attrs, mnesia:table_info(Tab, attributes)),
+    ?match({Tab, '_', '_'}, mnesia:table_info(Tab, wild_pattern)),
+    ok.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Check the error descriptions
@@ -216,11 +224,12 @@ db_node_lifecycle(Config) when is_list(Config) ->
     [Node1, Node2, Node3] = AllNodes = ?acquire_nodes(3, Config),
     Tab = db_node_lifecycle,
 
-    Who = fun(T) -> 
+    Who = fun(T) ->
 		  L1 = mnesia:table_info(T, ram_copies),
 		  L2 = mnesia:table_info(T, disc_copies),
 		  L3 = mnesia:table_info(T, disc_only_copies),
-		  L1 ++ L2 ++ L3
+		  L4 = mnesia:table_info(T, ext_ets),
+		  L1 ++ L2 ++ L3 ++ L4
 	  end,
 
     SNs = ?sort(AllNodes),
@@ -235,6 +244,7 @@ db_node_lifecycle(Config) when is_list(Config) ->
     ?match({error, _}, mnesia:create_schema([foo@bar])),
     ?match(ok, mnesia:start()),
     ?match(false, mnesia:system_info(use_dir)),
+    ?match([ram_copies, disc_copies, disc_only_copies], mnesia:system_info(backend_types)),
     ?match({atomic, ok}, mnesia:create_table(Tab, [])),
     ?match({aborted, {has_no_disc, Node1}}, mnesia:dump_tables([Tab])),
     ?match({aborted, {has_no_disc, Node1}}, mnesia:change_table_copy_type(Tab, node(), disc_copies)),
@@ -242,7 +252,7 @@ db_node_lifecycle(Config) when is_list(Config) ->
 
     ?match(stopped, mnesia:stop()),
 
-    ?match(ok, mnesia:create_schema(AllNodes)),
+    ?match(ok, mnesia:create_schema(AllNodes, ?BACKEND)),
     ?match([], mnesia_test_lib:start_mnesia(AllNodes)),
 
     ?match([SNs, SNs, SNs], 
@@ -271,12 +281,15 @@ db_node_lifecycle(Config) when is_list(Config) ->
     Tab3 = not_local,
     Tab4 = local,
     Tab5 = remote,
+    Tab6 = ext1,
 
     Tabs = [Schema,
 	    [{name, Tab2},  {disc_copies, AllNodes}],
 	    [{name, Tab3},  {ram_copies, [Node2, Node3]}],
 	    [{name, Tab4},  {disc_only_copies, [Node1]}],
-	    [{name, Tab5},  {disc_only_copies, [Node2]}]],    
+	    [{name, Tab5},  {disc_only_copies, [Node2]}],
+	    [{name, Tab6},  {ext_ets, [Node1, Node2]}]
+	   ],
 
     [?match({atomic, ok}, mnesia:create_table(T)) || T <- Tabs ],
 
@@ -287,31 +300,28 @@ db_node_lifecycle(Config) when is_list(Config) ->
     ?match({aborted, {node_not_running, Node1}}, 
 	   mnesia:del_table_copy(schema, Node2)),
 
-    ?match([], mnesia_test_lib:start_mnesia([Node1],[Tab2,Tab4])),
+    ?match([], mnesia_test_lib:start_mnesia([Node1],[Tab2,Tab4,Tab6])),
     ?match([], mnesia_test_lib:stop_mnesia([Node2])),
-    ?match({atomic, ok}, 
-	   mnesia:del_table_copy(schema, Node2)),
+    ?match({atomic, ok}, mnesia:del_table_copy(schema, Node2)),
 
-    %% Check     
+    %% Check
     RemNodes = AllNodes -- [Node2],
 
-    ?match(RemNodes, mnesia:system_info(db_nodes)),     
+    ?match(RemNodes, mnesia:system_info(db_nodes)),
     ?match([Node1], Who(Tab)),
     ?match(RemNodes, Who(Tab2)),
     ?match([Node3], Who(Tab3)),
     ?match([Node1], Who(Tab4)),
     ?match({'EXIT', {aborted, {no_exists, _, _}}}, Who(Tab5)),
+    ?match([Node1], Who(Tab6)),
 
-    ?match({atomic, ok},
-           mnesia:change_table_copy_type(Tab2, Node3, ram_copies)),
+    ?match({atomic, ok}, mnesia:change_table_copy_type(Tab2, Node3, ram_copies)),
 
-    ?match({atomic, ok},
-           mnesia:change_table_copy_type(schema, Node3, ram_copies)),
+    ?match({atomic, ok}, mnesia:change_table_copy_type(schema, Node3, ram_copies)),
 
     ?match([], mnesia_test_lib:stop_mnesia([Node3])),
-    ?match({atomic, ok}, 
-	   mnesia:del_table_copy(schema, Node3)),
-    ?match([Node1], mnesia:system_info(db_nodes)),     
+    ?match({atomic, ok}, mnesia:del_table_copy(schema, Node3)),
+    ?match([Node1], mnesia:system_info(db_nodes)),
     ?match([Node1], Who(Tab)),
     ?match([Node1], Who(Tab2)),
     ?match({'EXIT', {aborted, {no_exists, _, _}}}, Who(Tab3)),
@@ -363,7 +373,8 @@ start_and_stop(Config) when is_list(Config) ->
 checkpoint(suite) -> [];
 checkpoint(Config) when is_list(Config) ->
     checkpoint(2, Config),
-    checkpoint(3, Config).
+    checkpoint(3, Config),
+    ok.
 
 checkpoint(NodeConfig, Config) ->
     [Node1 | _] = TabNodes = ?acquire_nodes(NodeConfig, Config),
@@ -381,7 +392,7 @@ checkpoint(NodeConfig, Config) ->
                           CreateTab(Type, 3, [lists:last(TabNodes)])] ++
                              Acc
                  end,
-    Types = [ram_copies, disc_copies, disc_only_copies],
+    Types = [ram_copies, disc_copies, disc_only_copies, ext_ets],
     Tabs = lists:foldl(CreateTabs, [], Types),
     Recs = ?sort([{T, N, N} || T <- Tabs, N <- lists:seq(1, 10)]),
     lists:foreach(fun(R) -> ?match(ok, mnesia:dirty_write(R)) end, Recs),
@@ -430,25 +441,29 @@ checkpoint(NodeConfig, Config) ->
 replica_location(suite) -> [];
 replica_location(Config) when is_list(Config) ->
     [Node1, Node2, Node3] = Nodes = ?acquire_nodes(3, Config),
-    Tab = replica_location,
 
     %% Create three replicas
-    Schema = [{name, Tab}, {disc_only_copies, [Node1]},
-              {ram_copies, [Node2]}, {disc_copies, [Node3]}],
-    ?match({atomic, ok}, mnesia:create_table(Schema)),
-    ?match([], ?vrl(Tab, [Node1], [Node2], [Node3], Nodes)),
+    Check = fun(Tab, Schema) ->
+		    ?match({atomic, ok}, mnesia:create_table([{name, Tab}|Schema])),
+		    ?match([], ?vrl(Tab, [Node1], [Node2], [Node3], Nodes)),
 
-    %% Delete one replica
-    ?match({atomic, ok}, mnesia:del_table_copy(Tab, Node2)),
-    ?match([], ?vrl(Tab, [Node1], [], [Node3], Nodes)),
+		    %% Delete one replica
+		    ?match({atomic, ok}, mnesia:del_table_copy(Tab, Node2)),
+		    ?match([], ?vrl(Tab, [Node1], [], [Node3], Nodes)),
 
-    %% Move one replica
-    ?match({atomic, ok}, mnesia:move_table_copy(Tab, Node1, Node2)),
-    ?match([], ?vrl(Tab, [Node2], [], [Node3], Nodes)),
+		    %% Move one replica
+		    ?match({atomic, ok}, mnesia:move_table_copy(Tab, Node1, Node2)),
+		    ?match([], ?vrl(Tab, [Node2], [], [Node3], Nodes)),
+
+		    %% Change replica type
+		    ?match({atomic, ok}, mnesia:change_table_copy_type(Tab, Node2, ram_copies)),
+		    ?match([], ?vrl(Tab, [], [Node2], [Node3], Nodes))
+	    end,
+    Check(replica_location, [{disc_only_copies, [Node1]},
+			     {ram_copies, [Node2]}, {disc_copies, [Node3]}]),
 
-    %% Change replica type
-    ?match({atomic, ok}, mnesia:change_table_copy_type(Tab, Node2, ram_copies)),
-    ?match([], ?vrl(Tab, [], [Node2], [Node3], Nodes)),
+    Check(ext_location, [{disc_only_copies, [Node1]},
+			 {ext_ets, [Node2]}, {disc_copies, [Node3]}]),
 
     ?verify_mnesia(Nodes, []).
 
@@ -720,7 +735,7 @@ replica_management(Config) when is_list(Config) ->
     %%
     ?match({atomic, ok},
            mnesia:create_table([{name, Tab}, {attributes, Attrs},
-                                {ram_copies, [Node1, Node3]}])),
+                                {ram_copies, [Node1]}, {ext_ets, [Node3]}])),
     [?match(ok, mnesia:dirty_write({Tab, K, K + 2})) || K <-lists:seq(1, 10)],
     ?match([], ?vrl(Tab, [], [Node1, Node3], [], Nodes)),
     %% R - -
@@ -757,7 +772,7 @@ replica_management(Config) when is_list(Config) ->
     ?match([], ?vrl(Tab, [Node2], [], [Node1], Nodes)),
     ?match([0,10,10], ?SS(rpc:multicall(Nodes, mnesia, table_info, [Tab, size]))),
     %% D DO -
-    ?match({atomic, ok}, mnesia:add_table_copy(Tab, Node3, ram_copies)),
+    ?match({atomic, ok}, mnesia:add_table_copy(Tab, Node3, ext_ets)),
     ?match([], ?vrl(Tab, [Node2], [Node3], [Node1], Nodes)),
     ?match([10,10,10], ?SS(rpc:multicall(Nodes, mnesia, table_info, [Tab, size]))),
     %% D DO R
@@ -784,7 +799,7 @@ replica_management(Config) when is_list(Config) ->
     ?match([10,10,10], ?SS(rpc:multicall(Nodes, mnesia, table_info, [Tab, size]))),
 
     %% D DO D0
-    ?match({atomic, ok}, mnesia:change_table_copy_type(Tab, Node3, ram_copies)),
+    ?match({atomic, ok}, mnesia:change_table_copy_type(Tab, Node3, ext_ets)),
     ?match([], ?vrl(Tab, [Node2], [Node3], [Node1], Nodes)),
     ?match([10,10,10], ?SS(rpc:multicall(Nodes, mnesia, table_info, [Tab, size]))),
     %% D DO R
@@ -841,18 +856,31 @@ replica_management(Config) when is_list(Config) ->
     ?match([], ?vrl(Tab, [Node3], [], [Node2], Nodes)),
     ?match([0,10,10], ?SS(rpc:multicall(Nodes, mnesia, table_info, [Tab, size]))),
     %% - D DO
+    ?match({atomic, ok}, mnesia:change_table_copy_type(Tab, Node3, ext_ets)),
+    ?match([], ?vrl(Tab, [], [Node3], [Node2], Nodes)),
+    ?match([0,10,10], ?SS(rpc:multicall(Nodes, mnesia, table_info, [Tab, size]))),
+    %% - D ER
+    ?match({atomic, ok}, mnesia:move_table_copy(Tab, Node3, Node1)),
+    ?match([], ?vrl(Tab, [], [Node1], [Node2], Nodes)),
+    ?match([0,10,10], ?SS(rpc:multicall(Nodes, mnesia, table_info, [Tab, size]))),
+    %% ER D -
+
     ?match({aborted, _}, mnesia:move_table_copy(Tab, Node1, Node2)),
+    ?match({aborted, _}, mnesia:move_table_copy(Tab, Node3, Node2)),
+    ?match({atomic, ok}, mnesia:move_table_copy(Tab, Node1, Node3)),
+    %% - D ER
     ?match([], mnesia_test_lib:stop_mnesia([Node3])),
     ?match({atomic,ok}, mnesia:transaction(fun() -> mnesia:write({Tab, 43, sync_me}) end)),
-    ?match([], ?vrl(Tab, [Node3], [], [Node2],Nodes -- [Node3])),
-    %% - D DO
+    ?match([], ?vrl(Tab, [], [Node3], [Node2],Nodes -- [Node3])),
+    %% - D ER
     ?match({aborted,Reason56} when element(1, Reason56) == not_active,
 	   mnesia:move_table_copy(Tab, Node3, Node1)),
-    ?match([], ?vrl(Tab, [Node3], [], [Node2],Nodes -- [Node3])),
-    %% DO D -
+    ?match([], ?vrl(Tab, [], [Node3], [Node2],Nodes -- [Node3])),
+    %% - D ER
     ?match([], mnesia_test_lib:start_mnesia([Node3])),
-    ?match([], ?vrl(Tab, [Node3], [], [Node2], Nodes)),
-    %% DO D -
+    ?match([], ?vrl(Tab, [], [Node3], [Node2], Nodes)),
+    %% - D ER
+    ?match([{Tab,43,sync_me}], mnesia:dirty_read({Tab,43})),
     
     %%
     %% Transformer
@@ -990,7 +1018,7 @@ local_content(Config) when is_list(Config) ->
     ?match([], mnesia_test_lib:stop_mnesia([Node3])),
 
     %% Added for OTP-44306
-    ?match(ok, rpc:call(Node3, mnesia, start, [])),
+    ?match(ok, rpc:call(Node3, mnesia, start, [[{schema, ?BACKEND}]])),
     ?match({ok, _}, mnesia:change_config(extra_db_nodes, [Node3])),
 
     mnesia_test_lib:sync_tables([Node3], [Tab1]),
@@ -1427,7 +1455,7 @@ unsupp_user_props(Config) when is_list(Config) ->
 				       table_info, [silly1, user_properties])),
     ?match([{prop,propval2}], rpc:call(Node1, mnesia,
 				       table_info, [silly2, user_properties])),
-    ?match([{prop,propval3}], rpc:call(Node1, mnesia,
+    ?match([_,{prop,propval3}], rpc:call(Node1, mnesia,
 				       table_info, [schema, user_properties])),
 
     F2 = fun() ->
@@ -2262,6 +2290,10 @@ record_name_dirty_access_disc_only(suite) ->
 record_name_dirty_access_disc_only(Config) when is_list(Config) ->
     record_name_dirty_access(disc_only_copies, Config).
 
+record_name_dirty_access_xets(Config) when is_list(Config) ->
+    record_name_dirty_access(ext_ets, Config).
+
+
 record_name_dirty_access(Storage, Config) ->
     [Node1, _Node2] = Nodes = ?acquire_nodes(2, Config),
 
diff --git a/lib/mnesia/test/mnesia_recovery_test.erl b/lib/mnesia/test/mnesia_recovery_test.erl
index cd581787fb..2388b595d0 100644
--- a/lib/mnesia/test/mnesia_recovery_test.erl
+++ b/lib/mnesia/test/mnesia_recovery_test.erl
@@ -576,7 +576,7 @@ delete_during_start(Config) when is_list(Config) ->
     mnesia_test_lib:kill_mnesia([N2,N3]),
 %%    timer:sleep(500),
     ?match({[ok,ok],[]}, rpc:multicall([N2,N3], mnesia,start, 
-				       [[{extra_db_nodes,[N1]}]])),
+				       [[{extra_db_nodes,[N1]}, {schema, ?BACKEND}]])),
     [Tab1,Tab2,Tab3|_] = Tabs,
     ?match({atomic, ok}, mnesia:delete_table(Tab1)),
     ?match({atomic, ok}, mnesia:delete_table(Tab2)),
@@ -1542,7 +1542,7 @@ disc_less(Config) when is_list(Config) ->
     ?match(ok, rpc:call(Node2, mnesia, start, [])),
 
     timer:sleep(500),
-    ?match(ok, rpc:call(Node3, mnesia, start, [[{extra_db_nodes, [Node1, Node2]}]])),
+    ?match(ok, rpc:call(Node3, mnesia, start, [[{extra_db_nodes, [Node1, Node2]}, {schema, ?BACKEND}]])),
     ?match(ok, rpc:call(Node3, mnesia, wait_for_tables, [[Tab1, Tab2, Tab3], 20000])),
     ?match(ok, rpc:call(Node1, mnesia, wait_for_tables, [[Tab1, Tab2, Tab3], 20000])),
 
diff --git a/lib/mnesia/test/mnesia_test_lib.erl b/lib/mnesia/test/mnesia_test_lib.erl
index 616207ed1a..6e84a27ec9 100644
--- a/lib/mnesia/test/mnesia_test_lib.erl
+++ b/lib/mnesia/test/mnesia_test_lib.erl
@@ -142,6 +142,9 @@
 %% included for test server compatibility
 %% assume that all test cases only takes Config as sole argument
 init_per_testcase(_Func, Config) ->
+    Env = application:get_all_env(mnesia),
+    [application:unset_env(mnesia, Key, [{timeout, infinity}]) ||
+	{Key, _} <- Env, Key /= included_applications],
     global:register_name(mnesia_global_logger, group_leader()),
     Config.
 
@@ -668,11 +671,13 @@ do_prepare([delete_schema | Actions], Selected, All, Config, File, Line) ->
     end,
     do_prepare(Actions, Selected, All, Config, File, Line);
 do_prepare([create_schema | Actions], Selected, All, Config, File, Line) ->
+    Ext = ?BACKEND,
     case diskless(Config) of
 	true ->
+	    rpc:multicall(Selected, application, set_env, [mnesia, schema, Ext]),
 	    skip;
 	_Else ->
-	    case mnesia:create_schema(Selected) of
+	    case mnesia:create_schema(Selected, Ext) of
 		ok ->
 		    ignore;
 		BadNodes ->
@@ -975,7 +980,6 @@ reload_appls([Appl | Appls], Selected) ->
     {Ok2temp, Empty} = rpc:multicall(Selected, application, unload, [Appl]),
     Conv = fun({error,{not_loaded,mnesia}}) -> ok; (Else) -> Else end,
     Ok2 = {lists:map(Conv, Ok2temp), Empty},
-
     Ok3 = rpc:multicall(Selected, application, load, [Appl]),
     if
 	Ok /= Ok2 ->
@@ -1040,7 +1044,8 @@ verify_replica_location(Tab, DiscOnly0, Ram0, Disc0, AliveNodes0) ->
 
     S1 = ?match(AliveNodes, lists:sort(mnesia:system_info(running_db_nodes))),
     S2 = ?match(DiscOnly, lists:sort(mnesia:table_info(Tab, disc_only_copies))),
-    S3 = ?match(Ram, lists:sort(mnesia:table_info(Tab, ram_copies))),
+    S3 = ?match(Ram, lists:sort(mnesia:table_info(Tab, ram_copies) ++
+				    mnesia:table_info(Tab, ext_ets))),
     S4 = ?match(Disc, lists:sort(mnesia:table_info(Tab, disc_copies))),
     S5 = ?match(Write, lists:sort(mnesia:table_info(Tab, where_to_write))),
     S6 = case lists:member(This, Read) of
diff --git a/lib/mnesia/test/mnesia_test_lib.hrl b/lib/mnesia/test/mnesia_test_lib.hrl
index 714ec7a491..ba7eb10ea2 100644
--- a/lib/mnesia/test/mnesia_test_lib.hrl
+++ b/lib/mnesia/test/mnesia_test_lib.hrl
@@ -150,3 +150,5 @@
 
 -define(verify_mnesia(Ups, Downs),
 	mnesia_test_lib:verify_mnesia(Ups, Downs, ?FILE, ?LINE)).
+
+-define(BACKEND, [{backend_types, [{ext_ets, ext_test},{ext_dets, ext_test}]}]).
diff --git a/lib/mnesia/test/mnesia_trans_access_test.erl b/lib/mnesia/test/mnesia_trans_access_test.erl
index 38fb8d6a77..aa50ee4cb1 100644
--- a/lib/mnesia/test/mnesia_trans_access_test.erl
+++ b/lib/mnesia/test/mnesia_trans_access_test.erl
@@ -931,20 +931,20 @@ index_update_bag(Config)when is_list(Config) ->
     [IPos] = mnesia_lib:val({Tab,index}),
     ITab = mnesia_lib:val({index_test,{index, IPos}}),
     io:format("~n Index ~p @ ~p => ~p ~n~n",[IPos,ITab, ets:tab2list(ITab)]),
-    ?match([{2,1},{2,2},{12,1}], lists:keysort(1,ets:tab2list(ITab))),
+    %?match([{2,1},{2,2},{12,1}], lists:keysort(1,ets:tab2list(ITab))),
 
     ?match({atomic, ok}, mnesia:transaction(fun() -> mnesia:write(Rec5) end)),
     {atomic, R60} = mnesia:transaction(fun() -> mnesia:index_read(Tab, 2, ValPos) end),
     ?match([Rec1,Rec5,Rec2], lists:sort(R60)),
 
-    ?match([{2,1},{2,2},{12,1}], lists:keysort(1,ets:tab2list(ITab))),
+    %?match([{2,1},{2,2},{12,1}], lists:keysort(1,ets:tab2list(ITab))),
 
     ?match({atomic, ok}, mnesia:transaction(fun() -> mnesia:delete_object(Rec3) end)),
     {atomic, R61} = mnesia:transaction(fun() -> mnesia:index_read(Tab, 2, ValPos) end),
     ?match([Rec1,Rec5,Rec2], lists:sort(R61)),
     {atomic, R62} = mnesia:transaction(fun() -> mnesia:index_read(Tab,12, ValPos) end),
     ?match([], lists:sort(R62)),
-    ?match([{2,1},{2,2}], lists:keysort(1,ets:tab2list(ITab))),
+    %% ?match([{2,1},{2,2}], lists:keysort(1,ets:tab2list(ITab))),
 
     %% reset for rest of testcase
     ?match({atomic, ok}, mnesia:transaction(fun() -> mnesia:write(Rec3) end)),
@@ -1142,8 +1142,9 @@ create_live_table_index(Config, Storage) ->
     ?match([{atomic,ok}|_], [Create(N) || N <- lists:seq(1,50)]),
 
     ?match([], mnesia_test_lib:stop_mnesia([N2,N3])),
-    ?match(ok, rpc:call(N2, mnesia, start, [[{extra_db_nodes,[N1]}]])),
-    ?match(ok, rpc:call(N3, mnesia, start, [[{extra_db_nodes,[N1]}]])),
+    Ext = [{schema, ?BACKEND}],
+    ?match(ok, rpc:call(N2, mnesia, start, [[{extra_db_nodes,[N1]}|Ext]])),
+    ?match(ok, rpc:call(N3, mnesia, start, [[{extra_db_nodes,[N1]}|Ext]])),
 
     ?match({atomic, ok}, mnesia:add_table_index(Tab, ValPos)),