Import wiredtiger: 18dfb9e58e39927696affcd8e362364e23e1aa59 from branch mongodb-4.4

ref: a707df12a2..18dfb9e58e
for: 4.5.1

WT-5242       Minimize checkpoints pinned during backup
WT-5470       Reduce copies and allocations in read path
WT-5673       Prepare support with durable history: modify verify and salvage as needed
WT-5677       Prepare support with durable history: add test/format stress tests
WT-5710       Review WT_PANIC usage
WT-5716       Create the history store file at the same time as creating the metadata file in wiredtiger open
WT-5839       Ignore non-globally visible tombstones for both data store and hs store in hs verification
WT-5841       Return WT_TRY_SALVAGE when the history file is removed or truncated
WT-5928       Cleanup stale FIXMEs from durable history
WT-5977       WT_SESSION_NO_RECONCILE flag set by history cursor prevents eviction
WT-5984       Allow prepared updates to be evicted in durable history
WT-6009       Prepare support with durable history: add statistic for prepared updates evicted
WT-6032       Turn on mongodb-4.4 branch upgrade/downgrade testing
WT-6051       Fix reconstructing full value from modifies for string format
WT-6068       Re-enable tests temporarily disabled during durable history development
WT-6069       Remove WT_UPDATE_RESTORED_FROM_DISK flag
WT-6070       Coverity : Copy paste error
WT-6071       Coverity : Change format specifier
WT-6086       Move time windows and aggregated time windows into structures
WT-6087       Add a C2S(cursor) macro to simplify translation from a cursor to a session.
WT-6095       Verify on-disk page only for row store as part of rollback to stable
WT-6109       Cleanup usage of cursor->session
WT-6110       Cleanup cast from cbt to cursor
WT-6120       Remove use-after-free in __verify_history_store_id
WT-6130       Disable test_random_abort

1 files changed, 3 insertions, 3 deletions

diff --git a/src/third_party/wiredtiger/src/meta/meta_turtle.c b/src/third_party/wiredtiger/src/meta/meta_turtle.c
index 9bedba65310..119438fefcd 100644
--- a/src/third_party/wiredtiger/src/meta/meta_turtle.c
+++ b/src/third_party/wiredtiger/src/meta/meta_turtle.c
@@ -80,7 +80,7 @@ __metadata_load_hot_backup(WT_SESSION_IMPL *session)
             break;
         WT_ERR(__wt_getline(session, fs, value));
         if (value->size == 0)
-            WT_PANIC_ERR(session, EINVAL, "%s: zero-length value", WT_METADATA_BACKUP);
+            WT_ERR_PANIC(session, EINVAL, "%s: zero-length value", WT_METADATA_BACKUP);
         WT_ERR(__wt_metadata_update(session, key->data, value->data));
     }
 
@@ -381,7 +381,7 @@ err:
      */
     if (ret == 0 || strcmp(key, WT_METADATA_COMPAT) == 0 || F_ISSET(S2C(session), WT_CONN_SALVAGE))
         return (ret);
-    WT_PANIC_RET(session, WT_TRY_SALVAGE, "%s: fatal turtle file read error", WT_METADATA_TURTLE);
+    WT_RET_PANIC(session, WT_TRY_SALVAGE, "%s: fatal turtle file read error", WT_METADATA_TURTLE);
 }
 
 /*
@@ -437,5 +437,5 @@ err:
      */
     if (ret == 0)
         return (ret);
-    WT_PANIC_RET(session, ret, "%s: fatal turtle file update error", WT_METADATA_TURTLE);
+    WT_RET_PANIC(session, ret, "%s: fatal turtle file update error", WT_METADATA_TURTLE);
 }