diff options
| author | Alex Gorrod <alexander.gorrod@mongodb.com> | 2016-12-19 15:09:10 +1100 |
|---|---|---|
| committer | Alex Gorrod <alexander.gorrod@mongodb.com> | 2016-12-19 15:09:10 +1100 |
| commit | 4a185996c83862c2e4b911ce637591c4ff535108 (patch) | |
| tree | 90054641b4553601420173e54f1a39db2929e6ef /src/third_party/wiredtiger/src/include/txn.i | |
| parent | caba732fb722d5c2257d17dd09dec8a826c13795 (diff) | |
| download | mongo-4a185996c83862c2e4b911ce637591c4ff535108.tar.gz | |
Import wiredtiger: 8d2324943364286056ae399043f70b8a937de312 from branch mongodb-3.6
ref: 1b6c815a3f..8d23249433
for: 3.5.2
SERVER-26545 Remove fixed-size limitation on WiredTiger hazard pointers
WT-2402 Misaligned structure accesses lead to undefined behavior
WT-283 Add a way to change persistent object settings
WT-3056 For cursors with projections, keys should be allowed
WT-3061 syscall test runs with checkpoint_sync=false and doesn't acknowledge pwrite64
WT-3066 lint
WT-3068 Copy wtperf artifacts when running Jenkins tests
WT-3069 Fix build failures in LevelDB APIs
WT-3070 Fix search_near() for index cursor
WT-3071 Java: fix build with -Werror=sign-conversion
WT-3075 Document and enforce that WiredTiger now depends on Python 2.7
WT-3078 Fix a hang in the reconfiguration test.
WT-3084 Fix Coverity resource leak complaint.
Diffstat (limited to 'src/third_party/wiredtiger/src/include/txn.i')
| -rw-r--r-- | src/third_party/wiredtiger/src/include/txn.i | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/third_party/wiredtiger/src/include/txn.i b/src/third_party/wiredtiger/src/include/txn.i index 3e8dd45003e..0cc4a6f8439 100644 --- a/src/third_party/wiredtiger/src/include/txn.i +++ b/src/third_party/wiredtiger/src/include/txn.i @@ -62,7 +62,6 @@ __wt_txn_unmodify(WT_SESSION_IMPL *session) static inline int __wt_txn_modify(WT_SESSION_IMPL *session, WT_UPDATE *upd) { - WT_DECL_RET; WT_TXN_OP *op; WT_TXN *txn; @@ -77,7 +76,7 @@ __wt_txn_modify(WT_SESSION_IMPL *session, WT_UPDATE *upd) WT_TXN_OP_INMEM : WT_TXN_OP_BASIC; op->u.upd = upd; upd->txnid = session->txn.id; - return (ret); + return (0); } /* |