diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/mnesia/src/mnesia.appup.src | 36 | ||||
| -rw-r--r-- | lib/mnesia/src/mnesia_text.erl | 5 | ||||
| -rw-r--r-- | lib/mnesia/vsn.mk | 2 |
3 files changed, 10 insertions, 33 deletions
diff --git a/lib/mnesia/src/mnesia.appup.src b/lib/mnesia/src/mnesia.appup.src index 7bad6c4ea6..3691aa249a 100644 --- a/lib/mnesia/src/mnesia.appup.src +++ b/lib/mnesia/src/mnesia.appup.src @@ -1,33 +1,13 @@ %% -*- erlang -*- {"%VSN%", [ - {"4.4.17",[ - {update, mnesia_controller, soft, soft_purge, soft_purge, []} - ]}, - {"4.4.16",[ - {update, mnesia_controller, soft, soft_purge, soft_purge, []}, - {update, mnesia_frag, soft, soft_purge, soft_purge, []}, - {update, mnesia_schema, soft, soft_purge, soft_purge, []} - ]}, - {"4.4.15",[ - {update, mnesia_controller, soft, soft_purge, soft_purge, []}, - {update, mnesia_frag, soft, soft_purge, soft_purge, []}, - {update, mnesia, soft, soft_purge, soft_purge, []}, - {update, mnesia_dumper, soft, soft_purge, soft_purge, []} - ]} + {"4.4.18", [{restart_application, mnesia}]}, + {"4.4.17", [{restart_application, mnesia}]}, + {"4.4.16", [{restart_application, mnesia}]} ], - {"4.4.17",[ - {update, mnesia_controller, soft, soft_purge, soft_purge, []} - ]}, - {"4.4.16",[ - {update, mnesia_controller, soft, soft_purge, soft_purge, []}, - {update, mnesia_frag, soft, soft_purge, soft_purge, []}, - {update, mnesia_schema, soft, soft_purge, soft_purge, []} - ]}, - {"4.4.15",[ - {update, mnesia_controller, soft, soft_purge, soft_purge, []}, - {update, mnesia_frag, soft, soft_purge, soft_purge, []}, - {update, mnesia, soft, soft_purge, soft_purge, []}, - {update, mnesia_dumper, soft, soft_purge, soft_purge, []} - ]} + [ + {"4.4.18", [{restart_application, mnesia}]}, + {"4.4.17", [{restart_application, mnesia}]}, + {"4.4.16", [{restart_application, mnesia}]} + ] }. diff --git a/lib/mnesia/src/mnesia_text.erl b/lib/mnesia/src/mnesia_text.erl index ab1362f6b6..0906d18da9 100644 --- a/lib/mnesia/src/mnesia_text.erl +++ b/lib/mnesia/src/mnesia_text.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 @@ -181,9 +181,6 @@ read_term_from_stream(Stream, File, Line) -> Str = Mod:format_error(What), io:format("Error in line:~p of:~p ~s\n", [NewLine, File, Str]), - error; - T -> - io:format("Error2 **~p~n",[T]), error end; {eof,_EndLine} -> diff --git a/lib/mnesia/vsn.mk b/lib/mnesia/vsn.mk index 38e1a94545..2fa629d064 100644 --- a/lib/mnesia/vsn.mk +++ b/lib/mnesia/vsn.mk @@ -1 +1 @@ -MNESIA_VSN = 4.4.18 +MNESIA_VSN = 4.4.19 |