summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsueloverso <sue@mongodb.com>2017-08-11 08:48:39 -0400
committerGitHub <noreply@github.com>2017-08-11 08:48:39 -0400
commit46ff71c23537a74020e7f43378b991bd78f3fbc7 (patch)
tree08ad6af270a466101b69ef3c0bec88360cf2a4bc
parent80c6cee91faf84c4772a98c40e60d0a6890ccb52 (diff)
downloadmongo-46ff71c23537a74020e7f43378b991bd78f3fbc7.tar.gz
WT-3499 Move txn_global outside of timestamp ifdef. (#3577)
* WT-3499 Move txn_global outside of timestamp ifdef. * Move initialization out of declaration.
-rw-r--r--src/txn/txn.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/txn/txn.c b/src/txn/txn.c
index 9d4677a46f6..50598ae9a09 100644
--- a/src/txn/txn.c
+++ b/src/txn/txn.c
@@ -568,9 +568,9 @@ __wt_txn_commit(WT_SESSION_IMPL *session, const char *cfg[])
WT_CONNECTION_IMPL *conn;
WT_DECL_RET;
WT_TXN *txn;
+ WT_TXN_GLOBAL *txn_global;
WT_TXN_OP *op;
#ifdef HAVE_TIMESTAMPS
- WT_TXN_GLOBAL *txn_global = &S2C(session)->txn_global;
wt_timestamp_t prev_commit_timestamp;
bool update_timestamp;
#endif
@@ -579,6 +579,7 @@ __wt_txn_commit(WT_SESSION_IMPL *session, const char *cfg[])
txn = &session->txn;
conn = S2C(session);
+ txn_global = &conn->txn_global;
did_update = txn->mod_count != 0;
locked = false;