diff options
| author | Luke Chen <luke.chen@mongodb.com> | 2018-06-04 15:29:21 +1000 |
|---|---|---|
| committer | Luke Chen <luke.chen@mongodb.com> | 2018-06-04 15:29:21 +1000 |
| commit | 3d62f3cd3744f4e71fde117f35d51df5c47f33d7 (patch) | |
| tree | 6fc1cb29effa15fa6f5d9092cd12edd411e30be0 /src/third_party/wiredtiger/src/include | |
| parent | 2a86ca0c461b64144e274ec00dd36d3c860e2141 (diff) | |
| download | mongo-3d62f3cd3744f4e71fde117f35d51df5c47f33d7.tar.gz | |
Import wiredtiger: c3eafe83e8e48632d8b221a86ded6b3d949da979 from branch mongodb-4.0
ref: 5e14c6107f..c3eafe83e8
for: 4.1.1
WT-4087 Store current compatibility within WiredTiger
Diffstat (limited to 'src/third_party/wiredtiger/src/include')
| -rw-r--r-- | src/third_party/wiredtiger/src/include/connection.h | 35 | ||||
| -rw-r--r-- | src/third_party/wiredtiger/src/include/extern.h | 1 | ||||
| -rw-r--r-- | src/third_party/wiredtiger/src/include/meta.h | 1 |
3 files changed, 20 insertions, 17 deletions
diff --git a/src/third_party/wiredtiger/src/include/connection.h b/src/third_party/wiredtiger/src/include/connection.h index 41c09261b29..77632646843 100644 --- a/src/third_party/wiredtiger/src/include/connection.h +++ b/src/third_party/wiredtiger/src/include/connection.h @@ -475,23 +475,24 @@ struct __wt_connection_impl { #define WT_CONN_CLOSING 0x000008u #define WT_CONN_CLOSING_NO_MORE_OPENS 0x000010u #define WT_CONN_CLOSING_TIMESTAMP 0x000020u -#define WT_CONN_EVICTION_NO_LOOKASIDE 0x000040u -#define WT_CONN_EVICTION_RUN 0x000080u -#define WT_CONN_IN_MEMORY 0x000100u -#define WT_CONN_LEAK_MEMORY 0x000200u -#define WT_CONN_LOOKASIDE_OPEN 0x000400u -#define WT_CONN_LSM_MERGE 0x000800u -#define WT_CONN_OPTRACK 0x001000u -#define WT_CONN_PANIC 0x002000u -#define WT_CONN_READONLY 0x004000u -#define WT_CONN_RECOVERING 0x008000u -#define WT_CONN_SERVER_ASYNC 0x010000u -#define WT_CONN_SERVER_CHECKPOINT 0x020000u -#define WT_CONN_SERVER_LOG 0x040000u -#define WT_CONN_SERVER_LSM 0x080000u -#define WT_CONN_SERVER_STATISTICS 0x100000u -#define WT_CONN_SERVER_SWEEP 0x200000u -#define WT_CONN_WAS_BACKUP 0x400000u +#define WT_CONN_COMPATIBILITY 0x000040u +#define WT_CONN_EVICTION_NO_LOOKASIDE 0x000080u +#define WT_CONN_EVICTION_RUN 0x000100u +#define WT_CONN_IN_MEMORY 0x000200u +#define WT_CONN_LEAK_MEMORY 0x000400u +#define WT_CONN_LOOKASIDE_OPEN 0x000800u +#define WT_CONN_LSM_MERGE 0x001000u +#define WT_CONN_OPTRACK 0x002000u +#define WT_CONN_PANIC 0x004000u +#define WT_CONN_READONLY 0x008000u +#define WT_CONN_RECOVERING 0x010000u +#define WT_CONN_SERVER_ASYNC 0x020000u +#define WT_CONN_SERVER_CHECKPOINT 0x040000u +#define WT_CONN_SERVER_LOG 0x080000u +#define WT_CONN_SERVER_LSM 0x100000u +#define WT_CONN_SERVER_STATISTICS 0x200000u +#define WT_CONN_SERVER_SWEEP 0x400000u +#define WT_CONN_WAS_BACKUP 0x800000u /* AUTOMATIC FLAG VALUE GENERATION STOP */ uint32_t flags; }; diff --git a/src/third_party/wiredtiger/src/include/extern.h b/src/third_party/wiredtiger/src/include/extern.h index b986eff6317..004c3fcd2e3 100644 --- a/src/third_party/wiredtiger/src/include/extern.h +++ b/src/third_party/wiredtiger/src/include/extern.h @@ -516,6 +516,7 @@ extern int __wt_ext_metadata_search(WT_EXTENSION_API *wt_api, WT_SESSION *wt_ses extern int __wt_ext_metadata_update(WT_EXTENSION_API *wt_api, WT_SESSION *wt_session, const char *key, const char *value) WT_GCC_FUNC_DECL_ATTRIBUTE((warn_unused_result)); extern int __wt_metadata_get_ckptlist(WT_SESSION *session, const char *name, WT_CKPT **ckptbasep) WT_GCC_FUNC_DECL_ATTRIBUTE((visibility("default"))) WT_GCC_FUNC_DECL_ATTRIBUTE((warn_unused_result)); extern void __wt_metadata_free_ckptlist(WT_SESSION *session, WT_CKPT *ckptbase) WT_GCC_FUNC_DECL_ATTRIBUTE((visibility("default"))); +extern int __wt_metadata_turtle_rewrite(WT_SESSION_IMPL *session) WT_GCC_FUNC_DECL_ATTRIBUTE((warn_unused_result)); extern int __wt_metadata_cursor_open(WT_SESSION_IMPL *session, const char *config, WT_CURSOR **cursorp) WT_GCC_FUNC_DECL_ATTRIBUTE((warn_unused_result)); extern int __wt_metadata_cursor(WT_SESSION_IMPL *session, WT_CURSOR **cursorp) WT_GCC_FUNC_DECL_ATTRIBUTE((warn_unused_result)); extern int __wt_metadata_cursor_release(WT_SESSION_IMPL *session, WT_CURSOR **cursorp) WT_GCC_FUNC_DECL_ATTRIBUTE((warn_unused_result)); diff --git a/src/third_party/wiredtiger/src/include/meta.h b/src/third_party/wiredtiger/src/include/meta.h index 97d86b44051..6ca2bb27832 100644 --- a/src/third_party/wiredtiger/src/include/meta.h +++ b/src/third_party/wiredtiger/src/include/meta.h @@ -38,6 +38,7 @@ #define WT_IS_METADATA(dh) F_ISSET((dh), WT_DHANDLE_IS_METADATA) #define WT_METAFILE_ID 0 /* Metadata file ID */ +#define WT_METADATA_COMPAT "Compatibility version" #define WT_METADATA_VERSION "WiredTiger version" /* Version keys */ #define WT_METADATA_VERSION_STR "WiredTiger version string" |