aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Gudmundsson <[email protected]>2016-12-05 10:36:31 +0100
committerDan Gudmundsson <[email protected]>2016-12-05 10:36:31 +0100
commit0d98ab028c299d1af85cf7c24bc9cd3fb2bd0de9 (patch)
tree4d2693cffaaa9c29a36fe7b0db5cc1acf633c209
parent210658e7271a7f1e62721a6ff6d77aa52586e31d (diff)
parentc5fa3721bbe6ea3742703a4662f94a11c2a4d5c1 (diff)
downloadotp-0d98ab028c299d1af85cf7c24bc9cd3fb2bd0de9.tar.gz
otp-0d98ab028c299d1af85cf7c24bc9cd3fb2bd0de9.tar.bz2
otp-0d98ab028c299d1af85cf7c24bc9cd3fb2bd0de9.zip
Merge branch 'maint'
* maint: Use off_heap memory queue for mnesia_tm Preserve key order in mnesia:table_info
-rw-r--r--lib/mnesia/src/mnesia.erl7
-rw-r--r--lib/mnesia/src/mnesia_tm.erl1
2 files changed, 5 insertions, 3 deletions
diff --git a/lib/mnesia/src/mnesia.erl b/lib/mnesia/src/mnesia.erl
index 7b0e4976a0..6de7214776 100644
--- a/lib/mnesia/src/mnesia.erl
+++ b/lib/mnesia/src/mnesia.erl
@@ -2062,9 +2062,10 @@ any_table_info(Tab, Item) when is_atom(Tab) ->
[] ->
abort({no_exists, Tab, Item});
Props ->
- lists:map(fun({setorbag, Type}) -> {type, Type};
- (Prop) -> Prop end,
- Props)
+ Rename = fun ({setorbag, Type}) -> {type, Type};
+ (Prop) -> Prop
+ end,
+ lists:sort(lists:map(Rename, Props))
end;
name ->
Tab;
diff --git a/lib/mnesia/src/mnesia_tm.erl b/lib/mnesia/src/mnesia_tm.erl
index 388b42cf15..305bf14bcf 100644
--- a/lib/mnesia/src/mnesia_tm.erl
+++ b/lib/mnesia/src/mnesia_tm.erl
@@ -80,6 +80,7 @@ start() ->
init(Parent) ->
register(?MODULE, self()),
process_flag(trap_exit, true),
+ process_flag(message_queue_data, off_heap),
%% Initialize the schema
IgnoreFallback = mnesia_monitor:get_env(ignore_fallback_at_startup),