diff options
| author | Dan Gudmundsson <[email protected]> | 2011-12-07 09:27:14 +0100 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2011-12-07 09:27:14 +0100 |
| commit | 6b0ab16b86cad902e85b077a078b8f7a6b831205 (patch) | |
| tree | ff87937bfeb1464fee10d49fd2f7879394760b3f /lib/mnesia/src/mnesia_monitor.erl | |
| parent | 71249e713aaf0f6aea513fd2347b0c5f303d1e6e (diff) | |
| parent | 14335e788f03ffdbd0540c20623eed9f1fc58de5 (diff) | |
| download | otp-6b0ab16b86cad902e85b077a078b8f7a6b831205.tar.gz otp-6b0ab16b86cad902e85b077a078b8f7a6b831205.tar.bz2 otp-6b0ab16b86cad902e85b077a078b8f7a6b831205.zip | |
Merge branch 'dgud/mnesia/impl-table-options/OTP-8970'
* dgud/mnesia/impl-table-options/OTP-8970:
[mnesia] Add possibility for implementation dependent storage options to create_table
Diffstat (limited to 'lib/mnesia/src/mnesia_monitor.erl')
| -rw-r--r-- | lib/mnesia/src/mnesia_monitor.erl | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/mnesia/src/mnesia_monitor.erl b/lib/mnesia/src/mnesia_monitor.erl index 8cb2e92c08..c08bbc879f 100644 --- a/lib/mnesia/src/mnesia_monitor.erl +++ b/lib/mnesia/src/mnesia_monitor.erl @@ -80,9 +80,9 @@ going_down = [], tm_started = false, early_connects = [], connecting, mq = []}). --define(current_protocol_version, {8,0}). +-define(current_protocol_version, {8,1}). --define(previous_protocol_version, {7,6}). +-define(previous_protocol_version, {8,0}). start() -> gen_server:start_link({local, ?MODULE}, ?MODULE, @@ -188,7 +188,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]. + [protocol_version(), ?previous_protocol_version, {7,6}]. needs_protocol_conversion(Node) -> case {?catch_val({protocol, Node}), protocol_version()} of @@ -417,6 +417,8 @@ 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, " |