summaryrefslogtreecommitdiff
path: root/src/third_party/wiredtiger/src/meta/meta_turtle.c
diff options
context:
space:
mode:
authorAlex Gorrod <alexg@wiredtiger.com>2016-02-29 16:12:10 +1100
committerAlex Gorrod <alexg@wiredtiger.com>2016-02-29 16:13:10 +1100
commitff0846809805c5a9a961314d3b6ec9ed7bbe0947 (patch)
tree9e48c798ee5718e97e13d064c64f15524b92bdd2 /src/third_party/wiredtiger/src/meta/meta_turtle.c
parent81efb319f05f4ec1b5bd4523b13694241e967fc2 (diff)
downloadmongo-ff0846809805c5a9a961314d3b6ec9ed7bbe0947.tar.gz
Import wiredtiger-wiredtiger-2.7.0-829-g4531b92.tar.gz from wiredtiger branch mongodb-3.4
ref: 4f38287..4531b92 SERVER-22784 Coverity analysis defect 77722: Unused value SERVER-22831 Low query rate with heavy cache pressure and an idle collection WT-2173 test/format cache stuck full WT-2264 Checkpoints cannot keep up with inserts WT-2349 Add ability to open databases read-only WT-2376 Modules should compile without including wt_internal.h header file WT-2382 Problem with custom collator for 'u' format with join cursor WT-2394 Long Unit Test for test_compact02 failed. WT-2395 Recovery failure with an LSM tree WT-2399 Add test case that verifies cursor traversal WT-2405 test utility error handling. WT-2407 recovery lint WT-2409 Minor Perf Regression in LSM WT-2410 Casting function pointers to different types WT-2411 LSM drop hang WT-2412 Truncate error tag is incorrect WT-2417 Windows Jenkins task is failing WT-2419 Tests fail to compile on windows due to new util functions WT-2420 LSM failed to read bytes WT-2423 Session reference count could be wrong if adding the handle fails WT-2425 evict-btree read through performance drop WT-2428 Make statistics logging compatible with MongoDB WT-2429 Add a statistic that tracks aggressive mode in eviction
Diffstat (limited to 'src/third_party/wiredtiger/src/meta/meta_turtle.c')
-rw-r--r--src/third_party/wiredtiger/src/meta/meta_turtle.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/third_party/wiredtiger/src/meta/meta_turtle.c b/src/third_party/wiredtiger/src/meta/meta_turtle.c
index 3d27f0b5845..471bb65cac0 100644
--- a/src/third_party/wiredtiger/src/meta/meta_turtle.c
+++ b/src/third_party/wiredtiger/src/meta/meta_turtle.c
@@ -113,8 +113,9 @@ __metadata_load_bulk(WT_SESSION_IMPL *session)
WT_DECL_RET;
uint32_t allocsize;
bool exist;
- const char *filecfg[] = { WT_CONFIG_BASE(session, file_meta), NULL };
- const char *key;
+ const char *filecfg[] = {
+ WT_CONFIG_BASE(session, file_meta), NULL, NULL };
+ const char *key, *value;
/*
* If a file was being bulk-loaded during the hot backup, it will appear
@@ -135,6 +136,8 @@ __metadata_load_bulk(WT_SESSION_IMPL *session)
* If the file doesn't exist, assume it's a bulk-loaded file;
* retrieve the allocation size and re-create the file.
*/
+ WT_ERR(cursor->get_value(cursor, &value));
+ filecfg[1] = value;
WT_ERR(__wt_direct_io_size_check(
session, filecfg, "allocation_size", &allocsize));
WT_ERR(__wt_block_manager_create(session, key, allocsize));