diff options
| author | Michael Cahill <michael.cahill@mongodb.com> | 2015-11-20 16:58:56 +1100 |
|---|---|---|
| committer | Michael Cahill <michael.cahill@mongodb.com> | 2015-11-20 16:58:56 +1100 |
| commit | fb959fb6020ade800db8674b598a04a1ab4c7e67 (patch) | |
| tree | 18f9ac021b8b44f2515fe805b6808f109af429fc /src/third_party/wiredtiger/src/block | |
| parent | 93637565b81ee9564fd22f4544c0a516f0e73f16 (diff) | |
| download | mongo-fb959fb6020ade800db8674b598a04a1ab4c7e67.tar.gz | |
Import wiredtiger-wiredtiger-mongodb-3.2.0-rc3-192-g4898aa4.tar.gz from wiredtiger branch mongodb-3.2
Diffstat (limited to 'src/third_party/wiredtiger/src/block')
| -rw-r--r-- | src/third_party/wiredtiger/src/block/block_ckpt.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/third_party/wiredtiger/src/block/block_ckpt.c b/src/third_party/wiredtiger/src/block/block_ckpt.c index 2c8ff89a5cf..adbcf0e3fdc 100644 --- a/src/third_party/wiredtiger/src/block/block_ckpt.c +++ b/src/third_party/wiredtiger/src/block/block_ckpt.c @@ -657,12 +657,10 @@ live_update: break; if ((a = ckpt->bpriv) == NULL) a = &block->live; - if (a->discard.entries != 0) { - __wt_errx(session, + if (a->discard.entries != 0) + WT_ERR_MSG(session, WT_ERROR, "first checkpoint incorrectly has blocks on the discard " "list"); - WT_ERR(WT_ERROR); - } #endif block->ckpt_inprogress = true; |