aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorDan Gudmundsson <[email protected]>2017-12-18 13:34:24 +0100
committerDan Gudmundsson <[email protected]>2017-12-18 13:34:24 +0100
commit2aa6311f09a344b6631c986b65f58bf641f6a9b0 (patch)
tree99015f9273ce587d66a3eeb4bd1bdfbba73818a8 /lib
parent41f397d27f574c50dd917942ed2b481f2ff3bae7 (diff)
parent6c7bc33453090db7f2853d8778290f51f548ddaa (diff)
downloadotp-2aa6311f09a344b6631c986b65f58bf641f6a9b0.tar.gz
otp-2aa6311f09a344b6631c986b65f58bf641f6a9b0.tar.bz2
otp-2aa6311f09a344b6631c986b65f58bf641f6a9b0.zip
Merge branch 'maint'
* maint: Updated OTP version Prepare release mnesia: Read schema user properties directly ssh: testcases for space trailing Hello msg ssh: Don't remove trailing WS in Hello msg
Diffstat (limited to 'lib')
-rw-r--r--lib/mnesia/src/mnesia_schema.erl16
1 files changed, 3 insertions, 13 deletions
diff --git a/lib/mnesia/src/mnesia_schema.erl b/lib/mnesia/src/mnesia_schema.erl
index 83cc19c678..71952af31c 100644
--- a/lib/mnesia/src/mnesia_schema.erl
+++ b/lib/mnesia/src/mnesia_schema.erl
@@ -952,19 +952,9 @@ get_index_plugins() ->
get_schema_user_property(mnesia_index_plugins).
get_schema_user_property(Key) ->
- Tab = schema,
- %% Must work reliably both within transactions and outside of transactions
- Res = case get(mnesia_activity_state) of
- undefined ->
- dirty_read_table_property(Tab, Key);
- _ ->
- do_read_table_property(Tab, Key)
- end,
- case Res of
- undefined ->
- [];
- {_, Types} ->
- Types
+ case dirty_read_table_property(schema, Key) of
+ undefined -> [];
+ {_, Types} -> Types
end.
get_ext_types_disc() ->