diff options
| author | Michael Cahill <michael.cahill@mongodb.com> | 2016-11-16 21:09:45 +1100 |
|---|---|---|
| committer | Michael Cahill <michael.cahill@mongodb.com> | 2016-11-16 21:09:45 +1100 |
| commit | ca6eee06ffdacc8e191987e64b3791740dad21e1 (patch) | |
| tree | 2ded23c60276ab8daec2a56c11bf20fd64ad9236 /src/include/txn.h | |
| parent | 85121cf51f39f6959e02d5364bc51d51e48fe15b (diff) | |
| parent | 1ce36af292fd0317021091a0523376b0533ac3bf (diff) | |
| download | mongo-ca6eee06ffdacc8e191987e64b3791740dad21e1.tar.gz | |
Merge branch 'develop' into mongodb-3.4mongodb-3.5.0mongodb-3.4.1mongodb-3.4.0
Diffstat (limited to 'src/include/txn.h')
| -rw-r--r-- | src/include/txn.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/include/txn.h b/src/include/txn.h index 774f635d7ba..344275e23d0 100644 --- a/src/include/txn.h +++ b/src/include/txn.h @@ -49,8 +49,11 @@ WT_ASSERT((s), (s)->txn.forced_iso > 0); \ (s)->txn.forced_iso--; \ WT_ASSERT((s), txn_state->id == saved_state.id && \ + (txn_state->metadata_pinned == saved_state.metadata_pinned ||\ + saved_state.metadata_pinned == WT_TXN_NONE) && \ (txn_state->pinned_id == saved_state.pinned_id || \ saved_state.pinned_id == WT_TXN_NONE)); \ + txn_state->metadata_pinned = saved_state.metadata_pinned; \ txn_state->pinned_id = saved_state.pinned_id; \ } while (0) |