diff options
| author | Rickard Green <[email protected]> | 2018-08-10 13:00:17 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2018-08-10 13:00:17 +0200 |
| commit | b55b9d7b824f5797b0a4f6c6316f716e92e3267f (patch) | |
| tree | ae334a305ac5951b9bad4af38604ecf61b86dacf /lib/mnesia/src/mnesia_loader.erl | |
| parent | 2e46944fce477abc44e5631766b580b6ed62a1a4 (diff) | |
| parent | 8cb79ba4d3b665e06a39c3437d7227c831753945 (diff) | |
| download | otp-b55b9d7b824f5797b0a4f6c6316f716e92e3267f.tar.gz otp-b55b9d7b824f5797b0a4f6c6316f716e92e3267f.tar.bz2 otp-b55b9d7b824f5797b0a4f6c6316f716e92e3267f.zip | |
Merge branch 'maint'
* maint:
Updated OTP version
Update release notes
Update version numbers
crypto: Fix crash in compute_key(ecdh, ...) on badarg
Relax add_table_copy restriction
Fixed #Ref ordering bug
Test #Ref ordering in lists and ets
Do NOT disc_load from ram_copies when master_node is set
ssl: Make sure that a correct cipher suite is selected
ssl: Correct handling of empty server SNI extension
Diffstat (limited to 'lib/mnesia/src/mnesia_loader.erl')
| -rw-r--r-- | lib/mnesia/src/mnesia_loader.erl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/mnesia/src/mnesia_loader.erl b/lib/mnesia/src/mnesia_loader.erl index ebe924a86e..2cdae0c906 100644 --- a/lib/mnesia/src/mnesia_loader.erl +++ b/lib/mnesia/src/mnesia_loader.erl @@ -67,7 +67,7 @@ do_get_disc_copy2(Tab, Reason, Storage, Type) when Storage == disc_copies -> EtsOpts = proplists:get_value(ets, StorageProps, []), Args = [{keypos, 2}, public, named_table, Type | EtsOpts], case Reason of - {dumper, _} -> %% Resources already allocated + {dumper, DR} when is_atom(DR) -> %% Resources already allocated ignore; _ -> mnesia_monitor:mktab(Tab, Args), @@ -91,8 +91,8 @@ do_get_disc_copy2(Tab, Reason, Storage, Type) when Storage == ram_copies -> EtsOpts = proplists:get_value(ets, StorageProps, []), Args = [{keypos, 2}, public, named_table, Type | EtsOpts], case Reason of - {dumper, _} -> %% Resources allready allocated - ignore; + {dumper, DR} when is_atom(DR) -> + ignore; %% Resources already allocated _ -> mnesia_monitor:mktab(Tab, Args), Fname = mnesia_lib:tab2dcd(Tab), @@ -131,7 +131,7 @@ do_get_disc_copy2(Tab, Reason, Storage, Type) when Storage == disc_only_copies - {repair, mnesia_monitor:get_env(auto_repair)} | DetsOpts], case Reason of - {dumper, _} -> + {dumper, DR} when is_atom(DR) -> mnesia_index:init_index(Tab, Storage), snmpify(Tab, Storage), set({Tab, load_node}, node()), |