diff options
| author | Dan Gudmundsson <[email protected]> | 2016-02-12 08:42:06 +0100 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2016-02-12 08:42:06 +0100 |
| commit | e84414ce53c7a1131c2356e81b5417badb1389c8 (patch) | |
| tree | 545c56466a350d6e11be9ed5da923b9f58ff05b6 /lib/mnesia/src/mnesia_monitor.erl | |
| parent | 5c023eaea4b35d1f2b2ccf7809bfeb9bc6384077 (diff) | |
| parent | c1f4d4a6d5c189f7cd4b3b073fb47f8dfb8d3fff (diff) | |
| download | otp-e84414ce53c7a1131c2356e81b5417badb1389c8.tar.gz otp-e84414ce53c7a1131c2356e81b5417badb1389c8.tar.bz2 otp-e84414ce53c7a1131c2356e81b5417badb1389c8.zip | |
Merge branch 'dgud/mnesia/del_schema_hangs/OTP-13284' into maint
* dgud/mnesia/del_schema_hangs/OTP-13284:
mnesia: let loader check if tablelock is needed
mnesia: Avoid deadlock possibility in mnesia:del_table_copy schema
Diffstat (limited to 'lib/mnesia/src/mnesia_monitor.erl')
| -rw-r--r-- | lib/mnesia/src/mnesia_monitor.erl | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/lib/mnesia/src/mnesia_monitor.erl b/lib/mnesia/src/mnesia_monitor.erl index 8313c3bda5..081d746257 100644 --- a/lib/mnesia/src/mnesia_monitor.erl +++ b/lib/mnesia/src/mnesia_monitor.erl @@ -82,9 +82,9 @@ going_down = [], tm_started = false, early_connects = [], connecting, mq = [], remote_node_status = []}). --define(current_protocol_version, {8,1}). +-define(current_protocol_version, {8,2}). --define(previous_protocol_version, {8,0}). +-define(previous_protocol_version, {8,1}). start() -> gen_server:start_link({local, ?MODULE}, ?MODULE, @@ -193,7 +193,7 @@ protocol_version() -> %% A sorted list of acceptable protocols the %% preferred protocols are first in the list acceptable_protocol_versions() -> - [protocol_version(), ?previous_protocol_version, {7,6}]. + [protocol_version(), ?previous_protocol_version]. needs_protocol_conversion(Node) -> case {?catch_val({protocol, Node}), protocol_version()} of @@ -424,8 +424,6 @@ handle_call({negotiate_protocol, Mon, Version, Protocols}, From, State) case hd(Protocols) of ?previous_protocol_version -> accept_protocol(Mon, MyVersion, ?previous_protocol_version, From, State); - {7,6} -> - accept_protocol(Mon, MyVersion, {7,6}, From, State); _ -> verbose("Connection with ~p rejected. " "version = ~p, protocols = ~p, " |