Import wiredtiger: 332dddfe0e48eb1c263455d3db9219ec5f7cdc30 from branch mongodb-4.4r4.4.4-rc0

ref: a52cd5a47a..332dddfe0e
for: 4.4.4

WT-6430       Move WT_CONN_SERVER flags into their own field
WT-6504       Don't fallback to onpage value as base value if we see the onpage value in the history store
WT-6567       Write "rollback to stable" subpage for Architecture Guide
WT-6772       Add support for prepared updates in datastore for test_hs09
WT-6901       Write "cursor" subpage for Architecture Guide
WT-7069       Enable column store configuration to history store
WT-7089       Don't skip checkpointing objects that have obsolete pages
WT-7091       Restrict usage of LSM to only operate in conjunction with compatible incremental backup mechanism
WT-7117       RTS to skip modifies that are more than on-disk base update while restoring an update
WT-7121       Include log-structured allocation python tests in WT
WT-7126       Coverity analysis defect 116991: Explicit null dereferenced
WT-7127       Coverity analysis defect 116992: Unchecked return value
WT-7128       Coverity analysis defect 116993: Resource leak
WT-7131       Tiered cursors should return error if configured with zero tiers

1 files changed, 6 insertions, 2 deletions

diff --git a/src/third_party/wiredtiger/test/suite/test_hs06.py b/src/third_party/wiredtiger/test/suite/test_hs06.py
index 967f1519807..cc38097da7f 100644
--- a/src/third_party/wiredtiger/test/suite/test_hs06.py
+++ b/src/third_party/wiredtiger/test/suite/test_hs06.py
@@ -47,8 +47,7 @@ class test_hs06(wttest.WiredTigerTestCase):
     conn_config = 'cache_size=50MB,statistics=(fast)'
     session_config = 'isolation=snapshot'
     key_format_values = [
-        # The commented columnar tests needs to be enabled once columnar page instantiated is fixed in (WT-6061).
-        # ('column', dict(key_format='r')),
+        ('column', dict(key_format='r')),
         ('integer', dict(key_format='i')),
         ('string', dict(key_format='S'))
     ]
@@ -210,6 +209,11 @@ class test_hs06(wttest.WiredTigerTestCase):
         self.session.rollback_transaction()
 
     def test_hs_prepare_reads(self):
+        # Prepare reads currently not supported with columnar store.
+        # Remove this once prepare reads is supported in WT-6061.
+        if self.key_format == 'r':
+            return
+
         # Create a small table.
         uri = "table:test_hs06"
         create_params = 'key_format={},value_format=S'.format(self.key_format)