Import wiredtiger-wiredtiger-2.8.0-441-g6f9a7a4.tar.gz from wiredtiger branch mongodb-3.4

ref: 636a7b2..6f9a7a4

WT-2554       Implement a framework for adding C test cases
WT-2610       Investigate eviction hazard pointer check
WT-2611       wtperf and/or WT_CONFIG_PARSER do not allow escaped double quotes
WT-2617       Bug in pluggable file system example
WT-2624       snprintf unsupported on MSVC 2013
WT-2626       snprintf errors with macro redefinition on MSVC2015
WT-2627       Coverity complaints
WT-2628       reconciliation can return without unlocking the page lock
WT-2629       Introduction of ppc64le crc32c assembly file has made the stack executable
WT-2630       Rename WT_FSTREAM methods to avoid using C99 reserved names
WT-2632       Test format failures due to "checkpoints cannot be dropped when in-use"
WT-2637       The file-extension documentation doesn't cover not-supported cases
WT-2644       'wt load -r' (rename) fails with LSM
WT-2646       Split the lock_wait flag into two, adding a checkpoint_wait flag
WT-2651       Coverity 1355591 resource leak
WT-2653       the custom file-system example should show device configuration
WT-2656       Builds failing on GCC 4.7 builder
WT-2659       csuite tests, assorted lint and cleanup.
WT-2660       Hang between eviction and connection close
WT-2661       Coverity failures: 1356050-1356053
WT-2662       For internal spell checking, strip out double quote literals, they confuse aspell
SERVER-24151  WiredTiger changes for MongoDB 3.3.7

1 files changed, 2 insertions, 10 deletions

diff --git a/src/third_party/wiredtiger/src/meta/meta_turtle.c b/src/third_party/wiredtiger/src/meta/meta_turtle.c
index 635daf63d7f..4d2b359bbed 100644
--- a/src/third_party/wiredtiger/src/meta/meta_turtle.c
+++ b/src/third_party/wiredtiger/src/meta/meta_turtle.c
@@ -18,12 +18,9 @@ __metadata_config(WT_SESSION_IMPL *session, char **metaconfp)
 	WT_DECL_ITEM(buf);
 	WT_DECL_RET;
 	const char *cfg[] = { WT_CONFIG_BASE(session, file_meta), NULL, NULL };
-	char *metaconf;
 
 	*metaconfp = NULL;
 
-	metaconf = NULL;
-
 	/* Create a turtle file with default values. */
 	WT_RET(__wt_scr_alloc(session, 0, &buf));
 	WT_ERR(__wt_buf_fmt(session, buf,
@@ -31,14 +28,9 @@ __metadata_config(WT_SESSION_IMPL *session, char **metaconfp)
 	    WT_METAFILE_ID,
 	    WT_BTREE_MAJOR_VERSION_MAX, WT_BTREE_MINOR_VERSION_MAX));
 	cfg[1] = buf->data;
-	WT_ERR(__wt_config_collapse(session, cfg, &metaconf));
+	ret = __wt_config_collapse(session, cfg, metaconfp);
 
-	*metaconfp = metaconf;
-
-	if (0) {
-err:		__wt_free(session, metaconf);
-	}
-	__wt_scr_free(session, &buf);
+err:	__wt_scr_free(session, &buf);
 	return (ret);
 }