diff options
| author | Michael Cahill <michael.cahill@mongodb.com> | 2016-05-05 15:38:12 +1000 |
|---|---|---|
| committer | Michael Cahill <michael.cahill@mongodb.com> | 2016-05-05 15:38:12 +1000 |
| commit | 636a7b25ef3eca6b98009330f4d35337d4f35717 (patch) | |
| tree | 7cc2e03ad96e206cbe73343feef10197023a37da /src/evict/evict_file.c | |
| parent | eaa7b5f0fcc62f356c33a2c56f45b609a73ca5dd (diff) | |
| parent | 75c22bc0c662622c14e5c47d99ff262cede2c6bf (diff) | |
| download | mongo-b064c1e78025e6c144e1cc135f0f36759d418ea2.tar.gz | |
Merge branch 'develop' into mongodb-3.4mongodb-3.3.6
Diffstat (limited to 'src/evict/evict_file.c')
| -rw-r--r-- | src/evict/evict_file.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/evict/evict_file.c b/src/evict/evict_file.c index ca98b1bd62a..ffd48afd1a7 100644 --- a/src/evict/evict_file.c +++ b/src/evict/evict_file.c @@ -26,7 +26,7 @@ __wt_evict_file(WT_SESSION_IMPL *session, WT_CACHE_OP syncop) WT_RET(__wt_evict_file_exclusive_on(session)); /* Make sure the oldest transaction ID is up-to-date. */ - __wt_txn_update_oldest(session, true); + WT_RET(__wt_txn_update_oldest(session, true)); /* Walk the tree, discarding pages. */ next_ref = NULL; @@ -86,6 +86,8 @@ __wt_evict_file(WT_SESSION_IMPL *session, WT_CACHE_OP syncop) __wt_page_can_evict(session, ref, NULL)); __wt_ref_out(session, ref); break; + case WT_SYNC_CHECKPOINT: + case WT_SYNC_WRITE_LEAVES: WT_ILLEGAL_VALUE_ERR(session); } } |