Import wiredtiger-wiredtiger-2.7.0-1122-g9cf8eb2.tar.gz from wiredtiger branch mongodb-3.4

ref: 444981a..9cf8eb2

SERVER-23040  Coverity analysis defect 98151: Dereference after null check
WT-2123       Don't clear allocated memory if not required
WT-2318       Configurable thread wake up time
WT-2322       Join cursor with isolation read-uncommitted may give different results with Bloom filters
WT-2345       Evicting tiny pages creates small pages on disk
WT-2375       Add tests for collators
WT-2381       Dump utility discards table config
WT-2384       lt, le conditions for ordering cursor in join cursor
WT-2391       De-prioritize eviction from indexes
WT-2404       Add streaming pack/unpack methods to the extension API
WT-2414       Avoid extractor calls for ordering cursor in join cursor
WT-2418       Rebalance operation failing with EBUSY
WT-2426       Deadlock caused by recent changes to checkpoint handle locking
WT-2431       Join statistics documentation needed
WT-2435       __wt_evict_file_exclusive_on/off cleanups
WT-2436       lt, le conditions for ref cursor with "strategy=bloom" in join cursor
WT-2443       Getting statistic for all indexes used in join cursor
WT-2444       Broken flag test in wtperf, whitespace
WT-2447       Join cursor reads main table
WT-2448       Add no_scale flag to relevant statistics
WT-2449       Configure should check for a 64-bit build
WT-2451       Allow eviction of metadata
WT-2454       checkpoint_sync=false does *not* prevent flushes/sync to disk.
WT-2456       Update Power8 CRC32 Code
WT-2457       Dropping an LSM table can fail with EBUSY when no user ops are active
WT-2459       Allow Configure scripts to provide the --tag option for libtool when compiling on PPC
WT-2460       Checkpoint failing with WT_ROLLBACK
WT-2461       Python sweep01 test failing
WT-2463       Test that measures idle CPU usage fails under valgrind
WT-2464       Valgrind errors.
WT-2465       Coverity 1352899: Dereference before null check
WT-2466       Coverity 1352893 Buffer not null terminated
WT-2467       Coverity 1352894: Logically dead code
WT-2468       Coverity 1352896: Explicit null dereferenced
WT-2469       Coverity 1352897: Integer overflowed argument
WT-2470       Coverity 1352898: Resource leak
WT-2471       Review WiredTiger "int" printf formats
WT-2473       MSVC doesn't support PRId64
WT-2475       Have reconf script remove cached configure results
WT-2476       btree->evict_lock is being accessed after being destroyed
WT-2477       Missing define in Windows wiredtiger_config.h
WT-2478       Valgrind test failures
WT-2481       Recent changes affect LSM performance
WT-2482       Coverity 1353015, 1353016, out-of-bounds access
WT-2483       readonly02 periodically fails
WT-2484       Coverity 1345809: unchecked return value
WT-2485       Test/format failure with Floating point exception
WT-2487       Release memory in manydbs test
WT-2489       Fix compiler warnings from /test/manydbs
WT-2490       search_near() returns wrong key for column-store
WT-2492       Windows test_config04.test_config04.test_invalid_config crashes
WT-2493       Verbose lsm_manager unsupported
WT-2494       Review calls to __wt_free, plus minor bug in an error path.
WT-2495       Missing memory initialization leads to crash on Windows
WT-2496       Testing revealed error unable to read root page
WT-2497       Enhance test/format to save a copy of backup
WT-2498       LSM tree drop hangs when a user cursor is open
WT-2499       LSM shutdown race causes segfault
WT-2501       Dropping a just opened LSM tree isn't safe
WT-2502       Memory leak in locking handles for checkpoint
WT-2503       Build warning in lsm_tree.c
WT-2506       Using an uninitialised value

1 files changed, 12 insertions, 10 deletions

diff --git a/src/third_party/wiredtiger/src/btree/col_srch.c b/src/third_party/wiredtiger/src/btree/col_srch.c
index 23eae75ec2b..4730267a545 100644
--- a/src/third_party/wiredtiger/src/btree/col_srch.c
+++ b/src/third_party/wiredtiger/src/btree/col_srch.c
@@ -211,7 +211,6 @@ descend:	/*
 leaf_only:
 	page = current->page;
 	cbt->ref = current;
-	cbt->recno = recno;
 
 	/* 
 	 * Don't bother searching if the caller is appending a new record where
@@ -225,13 +224,6 @@ leaf_only:
 	}
 
 	/*
-	 * Set the on-page slot to an impossible value larger than any possible
-	 * slot (it's used to interpret the search function's return after the
-	 * search returns an insert list for a page that has no entries).
-	 */
-	cbt->slot = UINT32_MAX;
-
-	/*
 	 * Search the leaf page.
 	 *
 	 * Search after a page is pinned does a search of the pinned page before
@@ -244,28 +236,38 @@ leaf_only:
 	 * that's impossibly large for the page. We do have additional setup to
 	 * do in that case, the record may be appended to the page.
 	 */
-	cbt->compare = 0;
 	if (page->type == WT_PAGE_COL_FIX) {
 		if (recno < page->pg_fix_recno) {
+			cbt->recno = page->pg_fix_recno;
 			cbt->compare = 1;
 			return (0);
 		}
 		if (recno >= page->pg_fix_recno + page->pg_fix_entries) {
 			cbt->recno = page->pg_fix_recno + page->pg_fix_entries;
 			goto past_end;
-		} else
+		} else {
+			cbt->recno = recno;
+			cbt->compare = 0;
 			ins_head = WT_COL_UPDATE_SINGLE(page);
+		}
 	} else {
 		if (recno < page->pg_var_recno) {
+			cbt->recno = page->pg_var_recno;
+			cbt->slot = 0;
 			cbt->compare = 1;
 			return (0);
 		}
 		if ((cip = __col_var_search(page, recno, NULL)) == NULL) {
 			cbt->recno = __col_var_last_recno(page);
+			cbt->slot = page->pg_var_entries == 0 ?
+			    0 : page->pg_var_entries - 1;
 			goto past_end;
 		} else {
+			cbt->recno = recno;
 			cbt->slot = WT_COL_SLOT(page, cip);
+			cbt->compare = 0;
 			ins_head = WT_COL_UPDATE_SLOT(page, cbt->slot);
+			F_SET(cbt, WT_CBT_VAR_ONPAGE_MATCH);
 		}
 	}