diff options
| author | Luke Chen <luke.chen@mongodb.com> | 2021-12-03 20:21:40 +1100 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2021-12-03 09:47:48 +0000 |
| commit | cf8ddbdf99ae7fb2d96ca9f350224ffa193e40b3 (patch) | |
| tree | 6918640640e073cd85b60e7a13e5f59a73710a4c /src/third_party/wiredtiger/src/meta/meta_turtle.c | |
| parent | be2742a372eacf77cf6a8185f885cf41c10ab4f5 (diff) | |
| download | mongo-cf8ddbdf99ae7fb2d96ca9f350224ffa193e40b3.tar.gz | |
Import wiredtiger: 868741b596668cf0000f1b659b2eeb331a1def53 from branch mongodb-master
ref: f58c8da595..868741b596
for: 5.2.0
WT-8395 Inconsistent data after upgrade from 4.4.2-4.4.4 to 4.4.8+ and 5.0.2+
Diffstat (limited to 'src/third_party/wiredtiger/src/meta/meta_turtle.c')
| -rw-r--r-- | src/third_party/wiredtiger/src/meta/meta_turtle.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/third_party/wiredtiger/src/meta/meta_turtle.c b/src/third_party/wiredtiger/src/meta/meta_turtle.c index ed9cc9c3074..8e95510f99a 100644 --- a/src/third_party/wiredtiger/src/meta/meta_turtle.c +++ b/src/third_party/wiredtiger/src/meta/meta_turtle.c @@ -153,7 +153,7 @@ int __wt_turtle_validate_version(WT_SESSION_IMPL *session) { WT_DECL_RET; - uint32_t major, minor; + uint32_t major, minor, patch; char *version_string; WT_WITH_TURTLE_LOCK( @@ -162,7 +162,7 @@ __wt_turtle_validate_version(WT_SESSION_IMPL *session) if (ret != 0) WT_ERR_MSG(session, ret, "Unable to read version string from turtle file"); - if ((ret = sscanf(version_string, "major=%u,minor=%u", &major, &minor)) != 2) + if ((ret = sscanf(version_string, "major=%u,minor=%u,patch=%u", &major, &minor, &patch)) != 3) WT_ERR_MSG(session, ret, "Unable to parse turtle file version string"); ret = 0; @@ -171,6 +171,10 @@ __wt_turtle_validate_version(WT_SESSION_IMPL *session) (major == WT_MIN_STARTUP_VERSION_MAJOR && minor < WT_MIN_STARTUP_VERSION_MINOR)) WT_ERR_MSG(session, WT_ERROR, "WiredTiger version incompatible with current binary"); + S2C(session)->recovery_major = major; + S2C(session)->recovery_minor = minor; + S2C(session)->recovery_patch = patch; + err: __wt_free(session, version_string); return (ret); |