Import wiredtiger: 1a3371324597a8f124c126c2df11303ded4d8dd9 from branch mongodb-4.6

ref: 1124e23db6..1a33713245
for: 4.5.1

WT-5940       Migrate to Clang Format 10
WT-6000       Enhance incremental backup testing in format to support restart
WT-6471       Avoid the error message for non-existent clang-format binary
WT-6560       Fix usage of global salvage in WT utility
WT-6577       History store dump outputs confusing time window
WT-6586       Tombstone inserted to history store should also be flagged as WT_UPDATE_HS

1 files changed, 7 insertions, 9 deletions

diff --git a/src/third_party/wiredtiger/test/fops/t.c b/src/third_party/wiredtiger/test/fops/t.c
index d73fe635abe..db366bfb22c 100644
--- a/src/third_party/wiredtiger/test/fops/t.c
+++ b/src/third_party/wiredtiger/test/fops/t.c
@@ -57,11 +57,12 @@ main(int argc, char *argv[])
         const char *uri;
         const char *desc;
         const char *config;
-    } * cp, configs[] = {{"file:wt", NULL, NULL}, {"table:wt", NULL, NULL},
+    } * cp,
+      configs[] = {{"file:wt", NULL, NULL}, {"table:wt", NULL, NULL},
 /* Configure for a modest cache size. */
 #define LSM_CONFIG "lsm=(chunk_size=1m,merge_max=2),leaf_page_max=4k"
-              {"lsm:wt", NULL, LSM_CONFIG}, {"table:wt", " [lsm]", "type=lsm," LSM_CONFIG},
-              {NULL, NULL, NULL}};
+        {"lsm:wt", NULL, LSM_CONFIG}, {"table:wt", " [lsm]", "type=lsm," LSM_CONFIG},
+        {NULL, NULL, NULL}};
     u_int nthreads;
     int ch, cnt, runs;
     char *config_open, *working_dir;
@@ -150,9 +151,8 @@ wt_startup(char *config_open)
     testutil_make_work_dir(home);
 
     testutil_check(__wt_snprintf(config_buf, sizeof(config_buf),
-      "create,error_prefix=\"%s\",cache_size=5MB%s%s,"
-      "operation_tracking=(enabled=false)",
-      progname, config_open == NULL ? "" : ",", config_open == NULL ? "" : config_open));
+      "create,error_prefix=\"%s\",cache_size=5MB%s%s,operation_tracking=(enabled=false)", progname,
+      config_open == NULL ? "" : ",", config_open == NULL ? "" : config_open));
     testutil_check(wiredtiger_open(home, &event_handler, config_buf, &conn));
 }
 
@@ -233,9 +233,7 @@ static int
 usage(void)
 {
     fprintf(stderr,
-      "usage: %s "
-      "[-C wiredtiger-config] [-l log] [-n ops] [-r runs] [-t threads] "
-      "[-x] \n",
+      "usage: %s [-C wiredtiger-config] [-l log] [-n ops] [-r runs] [-t threads] [-x] \n",
       progname);
     fprintf(stderr, "%s",
       "\t-C specify wiredtiger_open configuration arguments\n"