diff options
| author | Dan Gudmundsson <[email protected]> | 2011-03-09 12:01:59 +0100 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2011-03-09 12:01:59 +0100 |
| commit | b42fe05f759054baf8eaf7796500de1aea47ba70 (patch) | |
| tree | 74bc84edaf07b320ea30563ebc46d3c499b53631 | |
| parent | 5a4f4654c243092362949e83033df183a513cf4c (diff) | |
| parent | 6a486ff2dfa285e913a1d0b013c2165c9a5a7b42 (diff) | |
| download | otp-b42fe05f759054baf8eaf7796500de1aea47ba70.tar.gz otp-b42fe05f759054baf8eaf7796500de1aea47ba70.tar.bz2 otp-b42fe05f759054baf8eaf7796500de1aea47ba70.zip | |
Merge branch 'dgud/mnesia/frag_first/OTP-9108' into dev
| -rw-r--r-- | lib/mnesia/src/mnesia_frag.erl | 2 | ||||
| -rw-r--r-- | lib/mnesia/test/mnesia_SUITE.erl | 4 |
2 files changed, 3 insertions, 3 deletions
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 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. |