From 700e0b89f7c928fbd3593a79e9038582ffb68406 Mon Sep 17 00:00:00 2001 From: Dan Gudmundsson Date: Mon, 7 Mar 2011 16:24:28 +0100 Subject: The number of test nodes where to small for the testsuite A miss introduced when converting to common_test --- lib/mnesia/test/mnesia_SUITE.erl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/mnesia') diff --git a/lib/mnesia/test/mnesia_SUITE.erl b/lib/mnesia/test/mnesia_SUITE.erl index fe7d366eb3..8ba8427213 100644 --- a/lib/mnesia/test/mnesia_SUITE.erl +++ b/lib/mnesia/test/mnesia_SUITE.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1997-2010. All Rights Reserved. +%% Copyright Ericsson AB 1997-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 @@ -30,7 +30,7 @@ end_per_testcase(Func, Conf) -> mnesia_test_lib:end_per_testcase(Func, Conf). %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -suite() -> [{ct_hooks,[{ts_install_cth,[{nodenames,1}]}]}]. +suite() -> [{ct_hooks,[{ts_install_cth,[{nodenames,2}]}]}]. %% Verify that Mnesia really is a distributed real-time DBMS. -- cgit v1.2.3 From 6a486ff2dfa285e913a1d0b013c2165c9a5a7b42 Mon Sep 17 00:00:00 2001 From: Dan Gudmundsson Date: Mon, 7 Mar 2011 16:25:31 +0100 Subject: Applied from mnesia_frag:first patch from Magnus Henoch "When I run mnesia:first on an empty fragmented table, it tries to access the fragment with the number one beyond the maximum. In the sample code below, I create a table with two fragments, 'foo' and 'foo_frag2', but mnesia tries to access 'foo_frag3':" --- lib/mnesia/src/mnesia_frag.erl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/mnesia') diff --git a/lib/mnesia/src/mnesia_frag.erl b/lib/mnesia/src/mnesia_frag.erl index 6cc16c80fd..9e77fe0b9f 100644 --- a/lib/mnesia/src/mnesia_frag.erl +++ b/lib/mnesia/src/mnesia_frag.erl @@ -209,7 +209,7 @@ first(ActivityId, Opaque, Tab) -> end end. -search_first(ActivityId, Opaque, Tab, N, FH) when N =< FH#frag_state.n_fragments -> +search_first(ActivityId, Opaque, Tab, N, FH) when N < FH#frag_state.n_fragments -> NextN = N + 1, NextFrag = n_to_frag_name(Tab, NextN), case mnesia:first(ActivityId, Opaque, NextFrag) of -- cgit v1.2.3