diff options
| author | Alex Gorrod <alexg@wiredtiger.com> | 2016-02-05 10:54:39 +1100 |
|---|---|---|
| committer | Alex Gorrod <alexg@wiredtiger.com> | 2016-02-05 10:54:44 +1100 |
| commit | 79a378bddf664714190dc9d0a34b1d8cd4951588 (patch) | |
| tree | 7b19d89e84b6110112e7a347f0bff7ab423f7b7c /src/third_party/wiredtiger/src/conn/conn_api.c | |
| parent | 66cd4ef95f4d5458678fcb772057e95b4ad5a26f (diff) | |
| download | mongo-79a378bddf664714190dc9d0a34b1d8cd4951588.tar.gz | |
Import wiredtiger-wiredtiger-2.7.0-592-gcc96d99.tar.gz from wiredtiger branch mongodb-3.4
ref: 7fea169..cc96d99
WT-60 Big endian port
WT-2130 Improve on-disk page utlilization with random workloads
WT-2215 WT_LSN needs to support atomic reads and updates
WT-2295 WT_SESSION.create does a full-scan of the main table
WT-2352 Allow build and test without requiring lz4
WT-2356 Log scan advances to next log file on partially written record
WT-2363 Remove built in support for bzip2
WT-2368 Row-store can pass garbage keys to collator functions
WT-2369 Use C compiler to detect headers instead of C++ compiler
WT-2371 Parent split cannot access the page after page-index swap
WT-2372 WiredTiger windows builder fails with C4005 against the "inline" macro
WT-2377 WTPERF doesn't compile in Windows under MSVC
WT-2378 Tasks time out on LSM builder
SERVER-22388 WiredTiger changes for MongoDB 3.3.2
SERVER-22437 Coverity analysis defect 77704: Redundant test
SERVER-22438 Coverity analysis defect 77705: Dereference before null check
Diffstat (limited to 'src/third_party/wiredtiger/src/conn/conn_api.c')
| -rw-r--r-- | src/third_party/wiredtiger/src/conn/conn_api.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/third_party/wiredtiger/src/conn/conn_api.c b/src/third_party/wiredtiger/src/conn/conn_api.c index 2f62950a36e..27977de63b2 100644 --- a/src/third_party/wiredtiger/src/conn/conn_api.c +++ b/src/third_party/wiredtiger/src/conn/conn_api.c @@ -402,7 +402,7 @@ __wt_encryptor_config(WT_SESSION_IMPL *session, WT_CONFIG_ITEM *cval, { WT_CONNECTION_IMPL *conn; WT_DECL_RET; - WT_ENCRYPTOR *encryptor; + WT_ENCRYPTOR *custom, *encryptor; WT_KEYED_ENCRYPTOR *kenc; WT_NAMED_ENCRYPTOR *nenc; uint64_t bucket, hash; @@ -440,12 +440,13 @@ __wt_encryptor_config(WT_SESSION_IMPL *session, WT_CONFIG_ITEM *cval, WT_ERR(__wt_strndup(session, keyid->str, keyid->len, &kenc->keyid)); encryptor = nenc->encryptor; if (encryptor->customize != NULL) { + custom = NULL; WT_ERR(encryptor->customize(encryptor, &session->iface, - cfg_arg, &encryptor)); - if (encryptor == NULL) - encryptor = nenc->encryptor; - else + cfg_arg, &custom)); + if (custom != NULL) { kenc->owned = 1; + encryptor = custom; + } } WT_ERR(encryptor->sizing(encryptor, &session->iface, &kenc->size_const)); @@ -2065,6 +2066,8 @@ wiredtiger_open(const char *home, WT_EVENT_HANDLER *event_handler, * DATABASE HOME, IT'S WHAT WE USE TO DECIDE IF WE'RE CREATING OR NOT. */ WT_ERR(__wt_turtle_init(session)); + + __wt_metadata_init(session); WT_ERR(__wt_metadata_cursor(session, NULL)); /* Start the worker threads and run recovery. */ |