diff options
| author | Keith Bostic <keith@wiredtiger.com> | 2015-05-01 09:49:23 -0400 |
|---|---|---|
| committer | Keith Bostic <keith@wiredtiger.com> | 2015-05-01 09:49:23 -0400 |
| commit | 3e1b6721f359651ffa36720b94eff760a4683a04 (patch) | |
| tree | bd93ed7d0b651a35995d5bde2c22ab905ac19f25 /dist | |
| parent | 79005dca4010ce65aa2a5552818c1c1fd4705719 (diff) | |
| parent | a5faf35fa0a6a6580d9fb5d2885e90a81f0a83db (diff) | |
| download | mongo-3e1b6721f359651ffa36720b94eff760a4683a04.tar.gz | |
Merge branch 'develop' into encryption-api
Diffstat (limited to 'dist')
| -rw-r--r-- | dist/flags.py | 7 | ||||
| -rw-r--r-- | dist/s_define.list | 1 | ||||
| -rw-r--r-- | dist/s_string.ok | 1 |
3 files changed, 6 insertions, 3 deletions
diff --git a/dist/flags.py b/dist/flags.py index 34f3ab3e02f..23f1b67714b 100644 --- a/dist/flags.py +++ b/dist/flags.py @@ -106,7 +106,10 @@ flags = { 'SESSION_CAN_WAIT', 'SESSION_CLEAR_EVICT_WALK', 'SESSION_DISCARD_FORCE', - 'SESSION_HANDLE_LIST_LOCKED', + 'SESSION_LOCKED_CHECKPOINT', + 'SESSION_LOCKED_HANDLE_LIST', + 'SESSION_LOCKED_SCHEMA', + 'SESSION_LOCKED_TABLE', 'SESSION_INTERNAL', 'SESSION_LOGGING_INMEM', 'SESSION_NO_CACHE', @@ -115,9 +118,7 @@ flags = { 'SESSION_NO_LOGGING', 'SESSION_NO_SCHEMA_LOCK', 'SESSION_SALVAGE_CORRUPT_OK', - 'SESSION_SCHEMA_LOCKED', 'SESSION_SERVER_ASYNC', - 'SESSION_TABLE_LOCKED', ], } diff --git a/dist/s_define.list b/dist/s_define.list index 2a6581cf880..eae95d527a1 100644 --- a/dist/s_define.list +++ b/dist/s_define.list @@ -44,6 +44,7 @@ WT_PACKED_STRUCT_BEGIN WT_PACKED_STRUCT_END WT_READ_BARRIER WT_REF_SIZE +WT_SESSION_LOCKED_CHECKPOINT WT_STAT_ATOMIC_DECR WT_STAT_ATOMIC_DECRV WT_STAT_ATOMIC_INCR diff --git a/dist/s_string.ok b/dist/s_string.ok index e7c058dd649..ebc8d92e10a 100644 --- a/dist/s_string.ok +++ b/dist/s_string.ok @@ -834,6 +834,7 @@ strtouq struct structs su +subdirectory subgetraw subgets subinit |