diff options
| author | Luke Chen <luke.chen@mongodb.com> | 2022-09-30 11:31:40 +1000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-09-30 02:03:48 +0000 |
| commit | 1cd29a0d7b554614df88de02935677fe582e2c8e (patch) | |
| tree | 7c54e0c2f7d6720356112cf29bafe9092e489cfc | |
| parent | f3481a5054f0d85917627ee7816416567ec9a6f7 (diff) | |
| download | mongo-1cd29a0d7b554614df88de02935677fe582e2c8e.tar.gz | |
Import wiredtiger: 01f71212d36e8f49ff9d2e59266c82231fa5b8d9 from branch mongodb-master
ref: 440964001d..01f71212d3
for: 6.2.0-rc0
WT-9825 Improve assert inside WT_READING_CHECKPOINT (#8310)
| -rw-r--r-- | src/third_party/wiredtiger/import.data | 2 | ||||
| -rw-r--r-- | src/third_party/wiredtiger/src/include/session.h | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data index e1212d37ce5..3f103eaf9f0 100644 --- a/src/third_party/wiredtiger/import.data +++ b/src/third_party/wiredtiger/import.data @@ -2,5 +2,5 @@ "vendor": "wiredtiger", "github": "wiredtiger/wiredtiger.git", "branch": "mongodb-master", - "commit": "440964001da03f8081c6a134fe10e0be2318d081" + "commit": "01f71212d36e8f49ff9d2e59266c82231fa5b8d9" } diff --git a/src/third_party/wiredtiger/src/include/session.h b/src/third_party/wiredtiger/src/include/session.h index 5da6f0368de..3bdb0804876 100644 --- a/src/third_party/wiredtiger/src/include/session.h +++ b/src/third_party/wiredtiger/src/include/session.h @@ -304,4 +304,6 @@ struct __wt_session_impl { }; /* Consider moving this to session_inline.h if it ever appears. */ -#define WT_READING_CHECKPOINT(s) ((s)->dhandle != NULL && WT_DHANDLE_IS_CHECKPOINT((s)->dhandle)) +#define WT_READING_CHECKPOINT(s) \ + ((s)->dhandle != NULL && F_ISSET((s)->dhandle, WT_DHANDLE_OPEN) && \ + WT_DHANDLE_IS_CHECKPOINT((s)->dhandle)) |