diff options
| author | Dan Gudmundsson <dgud@erlang.org> | 2017-12-18 13:30:48 +0100 |
|---|---|---|
| committer | Dan Gudmundsson <dgud@erlang.org> | 2017-12-18 13:30:48 +0100 |
| commit | 6c7bc33453090db7f2853d8778290f51f548ddaa (patch) | |
| tree | 1d233be679d9e8a27baa689d02838609e1dbc08d /lib/mnesia/src | |
| parent | ffc5d16de3350e754a4d4da2be42d29b821233e1 (diff) | |
| parent | 2e7160f3c28d495a8b798c5f8b484b1b977cee8e (diff) | |
| download | erlang-6c7bc33453090db7f2853d8778290f51f548ddaa.tar.gz | |
Merge branch 'maint-19' into maint
* maint-19:
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/mnesia/src')
| -rw-r--r-- | lib/mnesia/src/mnesia_schema.erl | 16 |
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() -> |