diff options
| author | Keith Bostic <keith@wiredtiger.com> | 2014-06-04 07:36:10 -0400 |
|---|---|---|
| committer | Keith Bostic <keith@wiredtiger.com> | 2014-06-04 07:36:10 -0400 |
| commit | 686b19449041e6eb61359223195b1182bfe1b650 (patch) | |
| tree | a884de10608c8fa6db3d4760cc7854f8968e0c06 /src | |
| parent | f7d8dd0f32ea37995a9235e679442422bd221122 (diff) | |
| download | mongo-686b19449041e6eb61359223195b1182bfe1b650.tar.gz | |
Minor formatting/editing to 13693dc: jump to err label in __conn_single()
instead of returning, add a test for the new wiredtiger_open() exclusive
configuration option.
Diffstat (limited to 'src')
| -rw-r--r-- | src/conn/conn_api.c | 6 | ||||
| -rw-r--r-- | src/include/wiredtiger.in | 5 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/conn/conn_api.c b/src/conn/conn_api.c index e5bb8a340d6..e801d7bfc2b 100644 --- a/src/conn/conn_api.c +++ b/src/conn/conn_api.c @@ -926,11 +926,11 @@ __conn_single(WT_SESSION_IMPL *session, const char *cfg[]) WT_ERR(__wt_write(session, conn->lock_fh, (off_t)0, len, buf)); created = 1; } else { - WT_RET(__wt_config_gets(session, cfg, "exclusive", &cval)); + WT_ERR(__wt_config_gets(session, cfg, "exclusive", &cval)); if (cval.val != 0) WT_ERR_MSG(session, EEXIST, - "WiredTiger database already existed and " - "exclusive option defined."); + "WiredTiger database already exists and exclusive " + "option configured"); created = 0; } diff --git a/src/include/wiredtiger.in b/src/include/wiredtiger.in index 2aa4e68b42b..36cfe20d822 100644 --- a/src/include/wiredtiger.in +++ b/src/include/wiredtiger.in @@ -1904,9 +1904,8 @@ struct __wt_connection { * (as a percentage)., an integer between 10 and 99; default \c 95.} * @config{eviction_workers, additional threads to help evict pages from cache., * an integer between 0 and 20; default \c 0.} - * @config{exclusive, fail if the database exists. When false (the default)\, - * if the object exists\, open the existing database. Should generally be - * paired with create option., a boolean flag; default \c false.} + * @config{exclusive, fail if the database already exists\, generally used with + * the \c create option., a boolean flag; default \c false.} * @config{extensions, list of shared library extensions to load (using dlopen). * Any values specified to an library extension are passed to * WT_CONNECTION::load_extension as the \c config parameter (for example\, |