diff options
| author | Keith Bostic <keith@wiredtiger.com> | 2015-02-02 20:06:20 -0500 |
|---|---|---|
| committer | Keith Bostic <keith@wiredtiger.com> | 2015-02-02 20:06:20 -0500 |
| commit | e615ca9c9e31f12d3cc6f6606d857ae267976643 (patch) | |
| tree | 7548718a58a9eadc1873831aa83166ef5a0d47d3 | |
| parent | a26d87a53eb2ac2dcae9312b7979499c34c11613 (diff) | |
| parent | 7a68a1643f9beafc34b69d2e52c8af741e9dc333 (diff) | |
| download | mongo-e615ca9c9e31f12d3cc6f6606d857ae267976643.tar.gz | |
Merge branch 'develop' into session-strerror
| -rw-r--r-- | src/btree/bt_vrfy.c | 7 | ||||
| -rw-r--r-- | test/suite/test_truncate03.py | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/btree/bt_vrfy.c b/src/btree/bt_vrfy.c index fafb4b58fc4..2957eda3a49 100644 --- a/src/btree/bt_vrfy.c +++ b/src/btree/bt_vrfy.c @@ -366,11 +366,16 @@ recno_chk: if (recno != vs->record_total + 1) goto celltype_err; break; case WT_PAGE_COL_VAR: - case WT_PAGE_ROW_LEAF: if (unpack->raw != WT_CELL_ADDR_LEAF && unpack->raw != WT_CELL_ADDR_LEAF_NO) goto celltype_err; break; + case WT_PAGE_ROW_LEAF: + if (unpack->raw != WT_CELL_ADDR_DEL && + unpack->raw != WT_CELL_ADDR_LEAF && + unpack->raw != WT_CELL_ADDR_LEAF_NO) + goto celltype_err; + break; case WT_PAGE_COL_INT: case WT_PAGE_ROW_INT: if (unpack->raw != WT_CELL_ADDR_INT) diff --git a/test/suite/test_truncate03.py b/test/suite/test_truncate03.py index 4e83734a77b..a69421b4217 100644 --- a/test/suite/test_truncate03.py +++ b/test/suite/test_truncate03.py @@ -100,7 +100,7 @@ class test_truncate_address_deleted(wttest.WiredTigerTestCase): # Test object creation, recovery, and conversion of address-deleted cells # into free pages, but instead of verifying the final object, instantiate - # empty pages by a reader the underlying leaf pages are removed. + # empty pages by a reader after the underlying leaf pages are removed. def test_truncate_address_deleted_empty_page(self): # Create the object on disk. self.address_deleted() |