diff options
| author | Dan Gudmundsson <[email protected]> | 2017-12-19 10:21:14 +0100 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2017-12-19 10:21:14 +0100 |
| commit | ac3328d8a231806a8c3444c636c606dcd59d9347 (patch) | |
| tree | 32cd5a50d92d9c5ed5b078a054b4a3d0406b8295 /lib | |
| parent | 9cbab81f1a38f568fd0bf9738230ce2ebeab0191 (diff) | |
| parent | 194513197e19cd592f3f5c2231510542f5193fe4 (diff) | |
| download | otp-ac3328d8a231806a8c3444c636c606dcd59d9347.tar.gz otp-ac3328d8a231806a8c3444c636c606dcd59d9347.tar.bz2 otp-ac3328d8a231806a8c3444c636c606dcd59d9347.zip | |
Merge branch 'maint-20' into maint
* maint-20:
Updated OTP version
Prepare release
mnesia: Fix checkpoint crash
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/mnesia/doc/src/notes.xml | 28 | ||||
| -rw-r--r-- | lib/mnesia/src/mnesia_checkpoint.erl | 4 | ||||
| -rw-r--r-- | lib/mnesia/vsn.mk | 2 |
3 files changed, 30 insertions, 4 deletions
diff --git a/lib/mnesia/doc/src/notes.xml b/lib/mnesia/doc/src/notes.xml index ebab612b58..ba94e913f5 100644 --- a/lib/mnesia/doc/src/notes.xml +++ b/lib/mnesia/doc/src/notes.xml @@ -39,7 +39,33 @@ thus constitutes one section in this document. The title of each section is the version number of Mnesia.</p> - <section><title>Mnesia 4.15.2</title> + <section><title>Mnesia 4.15.3</title> + + <section><title>Fixed Bugs and Malfunctions</title> + <list> + <item> + <p> + Removed a quadratic behavior in startup. This change + implies that backend plugins (if used) must be set when + the schema is created or via configuration parameters + before mnesia is started.</p> + <p> + Own Id: OTP-14829 Aux Id: ERIERL-84 </p> + </item> + <item> + <p> + Bad timing could crash mnesia after a checkpoint was + deactivated and reactivated with the same checkpoint name + on different tables.</p> + <p> + Own Id: OTP-14841 Aux Id: ERIERL-113 </p> + </item> + </list> + </section> + +</section> + +<section><title>Mnesia 4.15.2</title> <section><title>Fixed Bugs and Malfunctions</title> <list> diff --git a/lib/mnesia/src/mnesia_checkpoint.erl b/lib/mnesia/src/mnesia_checkpoint.erl index 2ff77326a9..8112378ffd 100644 --- a/lib/mnesia/src/mnesia_checkpoint.erl +++ b/lib/mnesia/src/mnesia_checkpoint.erl @@ -857,9 +857,9 @@ retainer_loop(Cp = #checkpoint_args{is_activated=false, name=Name}) -> retainer_loop(Cp = #checkpoint_args{name=Name}) -> receive {_From, {retain, Tid, Tab, Key, OldRecs}} -> - R = val({Tab, {retainer, Name}}), + R = ?catch_val({Tab, {retainer, Name}}), PendingTab = Cp#checkpoint_args.pending_tab, - case R#retainer.really_retain of + case is_record(R, retainer) andalso R#retainer.really_retain of true -> Store = R#retainer.store, try true = ets:member(PendingTab, Tid), diff --git a/lib/mnesia/vsn.mk b/lib/mnesia/vsn.mk index 67afbdc0de..45f811846d 100644 --- a/lib/mnesia/vsn.mk +++ b/lib/mnesia/vsn.mk @@ -1 +1 @@ -MNESIA_VSN = 4.15.2 +MNESIA_VSN = 4.15.3 |