aboutsummaryrefslogtreecommitdiffstats
path: root/lib/mnesia/src
diff options
context:
space:
mode:
authorDan Gudmundsson <[email protected]>2017-11-30 12:07:36 +0100
committerGitHub <[email protected]>2017-11-30 12:07:36 +0100
commit35266110ade3b34b879327e5bc4bbd2d367e305a (patch)
tree7434e8a2b71b71b04cb01d37c77423a4b8d5d6b1 /lib/mnesia/src
parent3b3a617453af3ea5a731516585888c2373825a1d (diff)
parentf6edffebcfd7973a747513585b7e8490e694402e (diff)
downloadotp-35266110ade3b34b879327e5bc4bbd2d367e305a.tar.gz
otp-35266110ade3b34b879327e5bc4bbd2d367e305a.tar.bz2
otp-35266110ade3b34b879327e5bc4bbd2d367e305a.zip
Merge pull request #1647 from aboroska/fix-mnesia-type-create_option
Fix type create_option() in mnesia
Diffstat (limited to 'lib/mnesia/src')
-rw-r--r--lib/mnesia/src/mnesia.erl3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/mnesia/src/mnesia.erl b/lib/mnesia/src/mnesia.erl
index b68b2de028..1842769778 100644
--- a/lib/mnesia/src/mnesia.erl
+++ b/lib/mnesia/src/mnesia.erl
@@ -151,7 +151,8 @@
{'snmp', SnmpStruct::term()} |
{'storage_properties', [{Backend::module(), [BackendProp::_]}]} |
{'type', 'set' | 'ordered_set' | 'bag'} |
- {'local_content', boolean()}.
+ {'local_content', boolean()} |
+ {'user_properties', proplists:proplist()}.
-type t_result(Res) :: {'atomic', Res} | {'aborted', Reason::term()}.
-type activity() :: 'ets' | 'async_dirty' | 'sync_dirty' | 'transaction' | 'sync_transaction' |