diff options
| author | Susan LoVerso <sue@wiredtiger.com> | 2015-04-28 10:44:39 -0400 |
|---|---|---|
| committer | Susan LoVerso <sue@wiredtiger.com> | 2015-04-28 10:44:39 -0400 |
| commit | d6a6c0506d793010d6974fba2c46ca834d1a17ee (patch) | |
| tree | dbf4ab5ff3ba4200694993be7615c4183c1d10b0 /ext | |
| parent | e501b28e37fb5128507c2016be2001e58acf9f82 (diff) | |
| parent | 7ad8058797330fcf3f632271565151cbb4ada661 (diff) | |
| download | mongo-d6a6c0506d793010d6974fba2c46ca834d1a17ee.tar.gz | |
Merge branch 'develop' into encryption-api
Conflicts:
dist/api_data.py
src/config/config_def.c
src/include/config.h
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/datasources/helium/helium.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/datasources/helium/helium.c b/ext/datasources/helium/helium.c index 3fc521d93b2..2b7cb5f7d4c 100644 --- a/ext/datasources/helium/helium.c +++ b/ext/datasources/helium/helium.c @@ -3427,7 +3427,7 @@ wiredtiger_extension_init(WT_CONNECTION *connection, WT_CONFIG_ARG *config) /* Add Helium-specific WT_SESSION.create configuration options. */ for (p = session_create_opts; *p != NULL; ++p) if ((ret = connection->configure_method(connection, - "session.create", "helium:", *p, "boolean", NULL)) != 0) + "WT_SESSION.create", "helium:", *p, "boolean", NULL)) != 0) EMSG_ERR(wtext, NULL, ret, "WT_CONNECTION.configure_method: session.create: " "%s: %s", |