Merge branch 'dgud/mnesia/add_index_crash/OTP-9285' into dev

* dgud/mnesia/add_index_crash/OTP-9285:
  Fix mnesia crash when adding index on non loaded tables.

2 files changed, 37 insertions, 7 deletions

diff --git a/lib/mnesia/src/mnesia_dumper.erl b/lib/mnesia/src/mnesia_dumper.erl
index 644133cf5d..55b9946ae9 100644
--- a/lib/mnesia/src/mnesia_dumper.erl
+++ b/lib/mnesia/src/mnesia_dumper.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
@@ -871,7 +871,11 @@ insert_op(Tid, _, {op, add_index, Pos, TabDef}, InPlace, InitBy) ->
 	startup ->
 	    ignore; 
 	_  ->
-	    mnesia_index:init_indecies(Tab, Storage, [Pos])
+	    case val({Tab,where_to_read}) of
+		nowhere -> ignore;
+		_ ->
+		    mnesia_index:init_indecies(Tab, Storage, [Pos])
+	    end
     end;
 
 insert_op(Tid, _, {op, del_index, Pos, TabDef}, InPlace, InitBy) ->
diff --git a/lib/mnesia/test/mnesia_trans_access_test.erl b/lib/mnesia/test/mnesia_trans_access_test.erl
index 55ba4dd761..ca3f0fbf49 100644
--- a/lib/mnesia/test/mnesia_trans_access_test.erl
+++ b/lib/mnesia/test/mnesia_trans_access_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
@@ -1102,9 +1102,9 @@ create_live_table_index_disc_only(Config) when is_list(Config) ->
     create_live_table_index(Config, disc_only_copies).
 
 create_live_table_index(Config, Storage) ->
-    [Node1] = Nodes = ?acquire_nodes(1, Config),
+    [N1,N2,N3] = Nodes = ?acquire_nodes(3, Config),
     Tab = create_live_table_index,
-    Schema = [{name, Tab}, {attributes, [k, v]}, {Storage, [Node1]}],
+    Schema = [{name, Tab}, {attributes, [k, v]}, {Storage, Nodes}],
     ?match({atomic, ok}, mnesia:create_table(Schema)),
     ValPos = 3,
     mnesia:dirty_write({Tab, 1, 2}),
@@ -1115,9 +1115,35 @@ create_live_table_index(Config, Storage) ->
           end,
     ?match({atomic, ok}, mnesia:transaction(Fun)),
     ?match({atomic, ok}, mnesia:add_table_index(Tab, ValPos)),
+    IRead = fun() -> lists:sort(mnesia:index_read(Tab, 2, ValPos)) end,
+    ?match({atomic, [{Tab, 1, 2},{Tab, 2, 2}]}, mnesia:transaction(IRead)),
+    ?match({atomic, ok}, mnesia:del_table_index(Tab, ValPos)),
+
+    %% Bug when adding index when table is still unloaded
+    %% By setting load order we hopefully will trigger the bug
+    mnesia:change_table_copy_type(Tab, N2, ram_copies),
+    mnesia:change_table_copy_type(Tab, N3, ram_copies),
+    ?match({atomic,ok}, mnesia:change_table_copy_type(schema, N2, ram_copies)),
+    ?match({atomic,ok}, mnesia:change_table_copy_type(schema, N3, ram_copies)),
+
+    Create = fun(N) ->
+		     TabN = list_to_atom("tab_" ++ integer_to_list(N)),
+		     Def = [{ram_copies, Nodes}, {load_order, N}],
+		     mnesia:create_table(TabN, Def)
+	     end,
+
+    ?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]}]])),
+    
+    ?match({atomic, ok}, mnesia:add_table_index(Tab, ValPos)),
+    
+    ?match({atomic, [{Tab, 1, 2},{Tab, 2, 2}]}, mnesia:transaction(IRead)),
     ?match({atomic, [{Tab, 1, 2},{Tab, 2, 2}]}, 
-	   mnesia:transaction(fun() -> lists:sort(mnesia:index_read(Tab, 2, ValPos)) 
-			      end)),
+	   rpc:call(N2, mnesia, transaction, [IRead])),
+    
     ?verify_mnesia(Nodes, []).
 
 %% Drop table index