diff options
| author | Michael Cahill <michael.cahill@wiredtiger.com> | 2015-01-17 07:48:42 +1100 |
|---|---|---|
| committer | Michael Cahill <michael.cahill@wiredtiger.com> | 2015-01-17 07:48:42 +1100 |
| commit | 1dae9366fda9c7a9ca3d85e7f1ee0e43fa569331 (patch) | |
| tree | e6d0cac3945999953466b8156ba7b3f616430b38 /src/lsm | |
| parent | a30db47d03f48220553922422950273a14118160 (diff) | |
| parent | 2bd04ab9f9d841a525a21612b90a835a9c517985 (diff) | |
| download | mongo-1dae9366fda9c7a9ca3d85e7f1ee0e43fa569331.tar.gz | |
Merge branch 'develop' into cursor-equal
Conflicts:
src/cursor/cur_std.c
src/cursor/cur_table.c
src/include/extern.h
Diffstat (limited to 'src/lsm')
| -rw-r--r-- | src/lsm/lsm_cursor.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/lsm/lsm_cursor.c b/src/lsm/lsm_cursor.c index c7d0d1ded9f..bf5ae465664 100644 --- a/src/lsm/lsm_cursor.c +++ b/src/lsm/lsm_cursor.c @@ -1438,6 +1438,7 @@ __wt_clsm_open(WT_SESSION_IMPL *session, __clsm_insert, /* insert */ __clsm_update, /* update */ __clsm_remove, /* remove */ + __wt_cursor_reconfigure, /* reconfigure */ __clsm_close); /* close */ WT_CURSOR *cursor; WT_CURSOR_LSM *clsm; @@ -1469,8 +1470,6 @@ __wt_clsm_open(WT_SESSION_IMPL *session, cursor->key_format = lsm_tree->key_format; cursor->value_format = lsm_tree->value_format; - WT_ERR(__wt_cursor_config_readonly(cursor, cfg, 0)); - clsm->lsm_tree = lsm_tree; /* |