diff options
| author | Alex Gorrod <alexander.gorrod@mongodb.com> | 2017-08-09 09:31:54 +1000 |
|---|---|---|
| committer | Alex Gorrod <alexander.gorrod@mongodb.com> | 2017-08-09 09:31:54 +1000 |
| commit | 0e916653f6b009fb4f95eac4ad241fdc22f3a0b7 (patch) | |
| tree | ec26a0f7c29182606618cfb8cfa36f150b877262 /src/third_party/wiredtiger/src/cursor/cur_std.c | |
| parent | 687cefdca8a59d9a6d49ff58f19ddd2b6374537a (diff) | |
| download | mongo-0e916653f6b009fb4f95eac4ad241fdc22f3a0b7.tar.gz | |
Import wiredtiger: 698847557ce7b3a938bbc8334d64a9430e4dc786 from branch mongodb-3.6
ref: 2e9744d11a..698847557c
for: 3.5.12
WT-3336 Review all jenkins jobs and ensure that they run with stats enabled and stat files are archived
WT-3378 Create a workload where dirty cache usage is similar to eviction_checkpoint_target
WT-3388 Online rollbackToStableTimestamp
WT-3456 Investigate the impact of statistics logging when statistics are disabled
WT-3458 Checkpoint should ignore stable_timestamp for logged tables
WT-3470 Avoid a metadata cursor open for table open/drop
WT-3471 Clear out each session's table cache
WT-3472 WT_CURSOR.modify has incorrect API wrapping macros
WT-3478 Coverity CID 1378760: Insecure data handling (TAINTED_SCALAR)
WT-3479 resolving modify updates before writing them to the lookaside file causes snapshot isolation failures.
WT-3480 WiredTiger connection close can hang joining async threads
WT-3481 lsm merge span fails to collect chunks to span
WT-3486 Discard obsolete updates as part of re-instantiating updates based on the lookaside table.
WT-3489 Provide an API to reset the commit_timestamp during rollback
WT-3490 WT_CURSOR.modify unaligned size_t access.
WT-3494 __cursor_needvalue() calls __cursor_localkey(), not __cursor_localvalue()
Diffstat (limited to 'src/third_party/wiredtiger/src/cursor/cur_std.c')
| -rw-r--r-- | src/third_party/wiredtiger/src/cursor/cur_std.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/third_party/wiredtiger/src/cursor/cur_std.c b/src/third_party/wiredtiger/src/cursor/cur_std.c index 28762f798c8..441bbbe55f8 100644 --- a/src/third_party/wiredtiger/src/cursor/cur_std.c +++ b/src/third_party/wiredtiger/src/cursor/cur_std.c @@ -591,8 +591,7 @@ __wt_cursor_equals(WT_CURSOR *cursor, WT_CURSOR *other, int *equalp) WT_ERR(cursor->compare(cursor, other, &cmp)); *equalp = (cmp == 0) ? 1 : 0; -err: API_END(session, ret); - return (ret); +err: API_END_RET(session, ret); } /* @@ -605,7 +604,7 @@ __cursor_modify(WT_CURSOR *cursor, WT_MODIFY *entries, int nentries) WT_DECL_RET; WT_SESSION_IMPL *session; - CURSOR_UPDATE_API_CALL(cursor, session, modify); + CURSOR_API_CALL(cursor, session, modify, NULL); WT_STAT_CONN_INCR(session, cursor_modify); WT_STAT_DATA_INCR(session, cursor_modify); @@ -633,8 +632,7 @@ __cursor_modify(WT_CURSOR *cursor, WT_MODIFY *entries, int nentries) /* We know both key and value are set, "overwrite" doesn't matter. */ ret = cursor->update(cursor); -err: CURSOR_UPDATE_API_END(session, ret); - return (ret); +err: API_END_RET(session, ret); } /* |