diff options
| author | Susan LoVerso <sue@wiredtiger.com> | 2014-02-26 10:31:55 -0500 |
|---|---|---|
| committer | Susan LoVerso <sue@wiredtiger.com> | 2014-02-26 10:31:55 -0500 |
| commit | 88e8a5eed0f77cbbd99e1819e39c820627841a1b (patch) | |
| tree | 19b16c6549ebd573470b39a38ad6f902077a1cd1 /src | |
| parent | 6565f622fe9acdfa80471264b1013665b5f54641 (diff) | |
| parent | 758f7cd142a266a68569cbc1dd86d4ab1b6d129d (diff) | |
| download | mongo-88e8a5eed0f77cbbd99e1819e39c820627841a1b.tar.gz | |
Merge branch 'develop' into lsm-fixes
Diffstat (limited to 'src')
| -rw-r--r-- | src/lsm/lsm_stat.c | 2 | ||||
| -rw-r--r-- | src/support/scratch.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/lsm/lsm_stat.c b/src/lsm/lsm_stat.c index 30148de9a9f..a626032fe8a 100644 --- a/src/lsm/lsm_stat.c +++ b/src/lsm/lsm_stat.c @@ -39,7 +39,7 @@ __lsm_stat_init(WT_SESSION_IMPL *session, const char *uri, WT_CURSOR_STAT *cst) "statistics=(%s%s%s)", cst->stat_clear ? "clear," : "", cst->stat_all ? "all," : "", - cst->stat_fast ? "fast," : ""); + !cst->stat_all && cst->stat_fast ? "fast," : ""); cfg[1] = disk_cfg[1] = config; } diff --git a/src/support/scratch.c b/src/support/scratch.c index 4b342977372..1aae8649901 100644 --- a/src/support/scratch.c +++ b/src/support/scratch.c @@ -127,7 +127,8 @@ __wt_buf_set( /* Ensure the buffer is large enough. */ WT_RET(__wt_buf_initsize(session, buf, size)); - memcpy(buf->mem, data, size); + /* Copy, allowing for overlapping strings. */ + memmove(buf->mem, data, size); return (0); } |