diff options
| author | Alex Gorrod <alexander.gorrod@mongodb.com> | 2016-12-12 12:23:13 +1100 |
|---|---|---|
| committer | Alex Gorrod <alexander.gorrod@mongodb.com> | 2016-12-12 12:23:13 +1100 |
| commit | 21a6f07d859c132154166bd3d83bbed238d5d719 (patch) | |
| tree | bc261840853dda4307c68fd1c889caf4c89dd3d3 /src/third_party/wiredtiger/src/include/meta.h | |
| parent | 7cf929f25638e4ad9525775c8ea0e18f3c86faf5 (diff) | |
| download | mongo-21a6f07d859c132154166bd3d83bbed238d5d719.tar.gz | |
Import wiredtiger: 1b6c815a3fd34f14c20d5cd627155799d1de535c from branch mongodb-3.6
ref: ca6eee06ff..1b6c815a3f
for: 3.5.1
WT-2336 Add a test validating schema operations via file system call monitoring
WT-2670 Add option to configure read-ahead per table and change default behavior
WT-2960 Inserting multi-megabyte values can cause pathological lookaside usage
WT-2969 Fix a bug that could cause snapshot corruption during compaction
WT-3014 Add GCC/clang support for ELF symbol visibility.
WT-3021 Fixes needed for Java log cursor example, Java raw mode cursors, log cursors in raw mode
WT-3025 fix error path in log_force_sync
WT-3028 Workloads with all dirty pages could trigger diagnostic stuck check
WT-3030 Test failure indicating invalid key order during traversal
WT-3034 Add support for single-writer named snapshots.
WT-3037 Fix some outdated comments in logging
WT-3048 WiredTiger maximum size warning uses the wrong format.
WT-3051 Remove external __wt_hex symbol.
WT-3052 Improve search if an index hint is wrong
WT-3053 Review Python and Java calls to internal WiredTiger functions
WT-3054 Java PackTest, PackTest03 do not compile
WT-3055 Java AsyncTest faults
WT-3057 WiredTiger hazard pointers should use the WT_REF, not the WT_PAGE.
WT-3064 minor tree cleanups: .gitignore, NEWS misspelling
Diffstat (limited to 'src/third_party/wiredtiger/src/include/meta.h')
| -rw-r--r-- | src/third_party/wiredtiger/src/include/meta.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/third_party/wiredtiger/src/include/meta.h b/src/third_party/wiredtiger/src/include/meta.h index 74df3c57ce4..68ac2e339d0 100644 --- a/src/third_party/wiredtiger/src/include/meta.h +++ b/src/third_party/wiredtiger/src/include/meta.h @@ -42,9 +42,9 @@ * WT_WITH_TURTLE_LOCK -- * Acquire the turtle file lock, perform an operation, drop the lock. */ -#define WT_WITH_TURTLE_LOCK(session, ret, op) do { \ +#define WT_WITH_TURTLE_LOCK(session, op) do { \ WT_ASSERT(session, !F_ISSET(session, WT_SESSION_LOCKED_TURTLE));\ - WT_WITH_LOCK(session, ret, \ + WT_WITH_LOCK_WAIT(session, \ &S2C(session)->turtle_lock, WT_SESSION_LOCKED_TURTLE, op); \ } while (0) |