diff options
| author | Erlang/OTP <[email protected]> | 2011-11-10 14:55:10 +0100 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2011-11-10 14:55:10 +0100 |
| commit | cfff1f4079a91b9e78aa8294186a1acae77d82d5 (patch) | |
| tree | ddb0cb549e98f37d068fac65c1821bcac796f102 /lib/mnesia/src/mnesia_frag.erl | |
| parent | f561a98a9b89738467b52ab5213562de753f6ad2 (diff) | |
| parent | 3879a583bf5a5889c2037b6410cd5ae58ff5e508 (diff) | |
| download | otp-cfff1f4079a91b9e78aa8294186a1acae77d82d5.tar.gz otp-cfff1f4079a91b9e78aa8294186a1acae77d82d5.tar.bz2 otp-cfff1f4079a91b9e78aa8294186a1acae77d82d5.zip | |
Merge branch 'dgud/mnesia/upgrade-cont/OTP-9657' into maint-r14
* dgud/mnesia/upgrade-cont/OTP-9657:
Prepare release
[mnesia] Fix deadlock in aborted mnesia:del_table_copy/2
[mnesia] Make all schema operations protocol aware
[mnesia] Remove export of clear_table which is not a schema operation anymore
[mnesia] Cleanly bring down mnesia
Diffstat (limited to 'lib/mnesia/src/mnesia_frag.erl')
| -rw-r--r-- | lib/mnesia/src/mnesia_frag.erl | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/mnesia/src/mnesia_frag.erl b/lib/mnesia/src/mnesia_frag.erl index 9e77fe0b9f..4a1616e054 100644 --- a/lib/mnesia/src/mnesia_frag.erl +++ b/lib/mnesia/src/mnesia_frag.erl @@ -758,7 +758,7 @@ make_activate(Tab, Props) -> [] -> Cs2 = Cs#cstruct{frag_properties = Props}, [Cs3] = expand_cstruct(Cs2, activate), - TabDef = mnesia_schema:cs2list(Cs3), + TabDef = mnesia_schema:vsn_cs2list(Cs3), Op = {op, change_table_frag, activate, TabDef}, [[Op]]; BadProps -> @@ -783,7 +783,7 @@ make_deactivate(Tab) -> mnesia:abort({combine_error, Tab, "Too many fragments"}); true -> Cs2 = Cs#cstruct{frag_properties = []}, - TabDef = mnesia_schema:cs2list(Cs2), + TabDef = mnesia_schema:vsn_cs2list(Cs2), Op = {op, change_table_frag, deactivate, TabDef}, [[Op]] end. @@ -850,7 +850,7 @@ make_add_frag(Tab, SortedNs) -> SplitOps = split(Tab, FH2, FromIndecies, FragNames, []), Cs2 = replace_frag_hash(Cs, FH2), - TabDef = mnesia_schema:cs2list(Cs2), + TabDef = mnesia_schema:vsn_cs2list(Cs2), BaseOp = {op, change_table_frag, {add_frag, SortedNs}, TabDef}, [BaseOp, NewOp | SplitOps]. @@ -962,7 +962,7 @@ make_del_frag(Tab) -> LastFrag = element(N, FragNames), [LastOp] = mnesia_schema:make_delete_table(LastFrag, single_frag), Cs2 = replace_frag_hash(Cs, FH2), - TabDef = mnesia_schema:cs2list(Cs2), + TabDef = mnesia_schema:vsn_cs2list(Cs2), BaseOp = {op, change_table_frag, del_frag, TabDef}, [BaseOp, LastOp | MergeOps]; _ -> @@ -1075,7 +1075,7 @@ make_add_node(Tab, Node) when is_atom(Node) -> Props = Cs#cstruct.frag_properties, Props2 = lists:keyreplace(node_pool, 1, Props, {node_pool, Pool2}), Cs2 = Cs#cstruct{frag_properties = Props2}, - TabDef = mnesia_schema:cs2list(Cs2), + TabDef = mnesia_schema:vsn_cs2list(Cs2), Op = {op, change_table_frag, {add_node, Node}, TabDef}, [Op]; true -> @@ -1104,7 +1104,7 @@ make_del_node(Tab, Node) when is_atom(Node) -> Pool2 = Pool -- [Node], Props = lists:keyreplace(node_pool, 1, Cs#cstruct.frag_properties, {node_pool, Pool2}), Cs2 = Cs#cstruct{frag_properties = Props}, - TabDef = mnesia_schema:cs2list(Cs2), + TabDef = mnesia_schema:vsn_cs2list(Cs2), Op = {op, change_table_frag, {del_node, Node}, TabDef}, [Op]; false -> |