diff options
| author | Michael Cahill <michael.cahill@mongodb.com> | 2016-11-07 16:47:30 +1100 |
|---|---|---|
| committer | Michael Cahill <michael.cahill@mongodb.com> | 2016-11-07 16:47:30 +1100 |
| commit | 0f0db45770f45eab89bd7c2530a259f5ed5b6334 (patch) | |
| tree | ea969f7a1ef67a08cf2280d5117f62a84ce94840 /src/third_party/wiredtiger/src/lsm/lsm_cursor.c | |
| parent | d23e79eb9e69bd746416d9f674dfaee59457c887 (diff) | |
| download | mongo-0f0db45770f45eab89bd7c2530a259f5ed5b6334.tar.gz | |
Import wiredtiger: 74430da40c96247c0a0d92f011ccfb2b175f1f32 from branch mongodb-3.4
ref: ef9a7983ea..74430da40c
for: 3.4.0
SERVER-26753 Minor speed regression (13%) and 'choppy' performance in 3.4 vs 3.2
WT-2415 Add option for join cursors to return false positives
WT-2945 Occasional hang running reconfigure fuzz test
WT-2947 test suite populate functions need refactoring
WT-2953 Test format failure - stuck cache with 1/42MB dirty
WT-2961 Add a version drop-down to the web version of the docs
WT-2964 WTPERF parallel-pop-btree hung in populate phase
WT-2968 backup cursor opens every file
WT-2971 Add documentation for raw compression to the WT docs
WT-2975 Reduce the memory allocated for statistics
WT-2991 Coverity issue 1365198
WT-2998 Add error messages to error returns that might be confusing.
WT-2999 Memory leak in join WT_CURSOR with custom extractor
WT-3001 WT_EXTENSION_API references are named inconsistently.
WT-3003 log generation should not auto generate the record and op types
WT-3005 Add top-level .gitignore file.
WT-3007 Remove duplicated word in comment
WT-3008 Run wtperf stress testing against all maintained branches
WT-3009 Test format hung/aborted with small cache (sub 10mB)
Diffstat (limited to 'src/third_party/wiredtiger/src/lsm/lsm_cursor.c')
| -rw-r--r-- | src/third_party/wiredtiger/src/lsm/lsm_cursor.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/third_party/wiredtiger/src/lsm/lsm_cursor.c b/src/third_party/wiredtiger/src/lsm/lsm_cursor.c index 067c527a21a..c20673563d9 100644 --- a/src/third_party/wiredtiger/src/lsm/lsm_cursor.c +++ b/src/third_party/wiredtiger/src/lsm/lsm_cursor.c @@ -1678,7 +1678,7 @@ __wt_clsm_open(WT_SESSION_IMPL *session, lsm_tree = NULL; if (!WT_PREFIX_MATCH(uri, "lsm:")) - return (EINVAL); + return (__wt_unexpected_object_type(session, uri, "lsm:")); if (F_ISSET(S2C(session), WT_CONN_IN_MEMORY)) WT_RET_MSG(session, EINVAL, |