diff options
| author | Alexander Gorrod <alexander.gorrod@mongodb.com> | 2015-07-23 23:23:52 +0000 |
|---|---|---|
| committer | Alexander Gorrod <alexander.gorrod@mongodb.com> | 2015-07-23 23:23:52 +0000 |
| commit | 455aa3de2fe23454b8acd2a6d4ae575f2bb1aa74 (patch) | |
| tree | 5f06bd87e9e5fbbeb7f709f919965f998cc8ec1b /src/third_party/wiredtiger/src/btree/bt_io.c | |
| parent | 92f1bacdb1dbc17919e7a0f77f0d6c5b981933da (diff) | |
| download | mongo-455aa3de2fe23454b8acd2a6d4ae575f2bb1aa74.tar.gz | |
Import wiredtiger-wiredtiger-2.6.1-332-gfdedd36.tar.gz from wiredtiger branch mongodb-3.2
Diffstat (limited to 'src/third_party/wiredtiger/src/btree/bt_io.c')
| -rw-r--r-- | src/third_party/wiredtiger/src/btree/bt_io.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/third_party/wiredtiger/src/btree/bt_io.c b/src/third_party/wiredtiger/src/btree/bt_io.c index ec7d3109c0c..a8bbf8a0266 100644 --- a/src/third_party/wiredtiger/src/btree/bt_io.c +++ b/src/third_party/wiredtiger/src/btree/bt_io.c @@ -73,7 +73,13 @@ __wt_bt_read(WT_SESSION_IMPL *session, ip = etmp; dsk = ip->data; - } + } else if (btree->kencryptor != NULL && + !F_ISSET(btree, WT_BTREE_VERIFY) && + !F_ISSET(session, WT_SESSION_SALVAGE_CORRUPT_OK)) + WT_ERR_MSG(session, WT_ERROR, + "encryption configured, and existing file is not " + "encrypted"); + if (F_ISSET(dsk, WT_PAGE_COMPRESSED)) { if (btree->compressor == NULL || btree->compressor->decompress == NULL) |