diff options
Diffstat (limited to 'src/third_party/wiredtiger/src/conn/conn_api.c')
| -rw-r--r-- | src/third_party/wiredtiger/src/conn/conn_api.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/third_party/wiredtiger/src/conn/conn_api.c b/src/third_party/wiredtiger/src/conn/conn_api.c index 78ee338f34e..799b199bfb2 100644 --- a/src/third_party/wiredtiger/src/conn/conn_api.c +++ b/src/third_party/wiredtiger/src/conn/conn_api.c @@ -2980,7 +2980,7 @@ wiredtiger_open(const char *home, WT_EVENT_HANDLER *event_handler, const char *c */ WT_ERR(__wt_config_gets(session, cfg, "verify_metadata", &cval)); verify_meta = cval.val; - WT_ERR(__wt_turtle_init(session, verify_meta)); + WT_ERR(__wt_turtle_init(session, verify_meta, cfg)); /* Verify the metadata file. */ if (verify_meta) { @@ -3045,6 +3045,15 @@ err: __wt_scr_discard(session); __wt_scr_discard(&conn->dummy_session); + /* + * Clean up the partial backup restore flag, backup btree id list. The backup id list was used + * in recovery to truncate the history store entries and the flag was used to allow schema drops + * to happen on tables to clean up the entries in the creation of the metadata file. + */ + F_CLR(conn, WT_CONN_BACKUP_PARTIAL_RESTORE); + if (conn->partial_backup_remove_ids != NULL) + __wt_free(session, conn->partial_backup_remove_ids); + if (ret != 0) { /* * Set panic if we're returning the run recovery error or if recovery did not complete so |