diff options
| author | Alex Gorrod <alexander.gorrod@mongodb.com> | 2016-09-16 06:21:24 +0000 |
|---|---|---|
| committer | Alex Gorrod <alexander.gorrod@mongodb.com> | 2016-09-16 06:21:24 +0000 |
| commit | 5bc03723a7e77c96b1d5e45a97173654872c727a (patch) | |
| tree | f0d12b535fee95b721d8d046c3e4dfbfec0a91e2 /src/include/txn.i | |
| parent | deeb0f589aab43f0d4b8d97755ed1e13808dcfab (diff) | |
| parent | 03bbd9d3c9330a5b6e3cbd7d2db1ac7fea5e96bf (diff) | |
| download | mongodb-3.3.13.tar.gz | |
Merge branch 'develop' into mongodb-3.4mongodb-3.3.14mongodb-3.3.13
Diffstat (limited to 'src/include/txn.i')
| -rw-r--r-- | src/include/txn.i | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/include/txn.i b/src/include/txn.i index ffd319fd5c1..1a8851a9a2a 100644 --- a/src/include/txn.i +++ b/src/include/txn.i @@ -21,7 +21,7 @@ __txn_next_op(WT_SESSION_IMPL *session, WT_TXN_OP **opp) txn = &session->txn; *opp = NULL; - /* + /* * We're about to perform an update. * Make sure we have allocated a transaction ID. */ @@ -414,7 +414,7 @@ __wt_txn_update_check(WT_SESSION_IMPL *session, WT_UPDATE *upd) if (txn->isolation == WT_ISO_SNAPSHOT) while (upd != NULL && !__wt_txn_visible(session, upd->txnid)) { if (upd->txnid != WT_TXN_ABORTED) { - WT_STAT_FAST_DATA_INCR( + WT_STAT_DATA_INCR( session, txn_update_conflict); return (WT_ROLLBACK); } |