Update upstream source from tag 'upstream/6.0.0'master

Update to upstream version '6.0.0'
with Debian dir 5604a80ec1c96ca76f25f40d78e6ef855abec322

1 files changed, 1 insertions, 8 deletions

diff --git a/src/mongo/db/update/update_driver.cpp b/src/mongo/db/update/update_driver.cpp
index 9839487da9d..5ce9dc8aa84 100644
--- a/src/mongo/db/update/update_driver.cpp
+++ b/src/mongo/db/update/update_driver.cpp
@@ -159,14 +159,7 @@ void UpdateDriver::parse(
                 "multi update is not supported for replacement-style update",
                 !multi);
 
-        // For updates that originated from the oplog, we're required to apply the update
-        // exactly as it was recorded (even if it contains zero-valued timestamps). Therefore,
-        // we should only replace zero-valued timestamps with the current time when both
-        // '_bypassEmptyTsReplacement' and '_fromOplogApplication' are false.
-        const bool bypassEmptyTsReplacement = _bypassEmptyTsReplacement || _fromOplogApplication;
-
-        _updateExecutor = std::make_unique<ObjectReplaceExecutor>(updateMod.getUpdateReplacement(),
-                                                                  bypassEmptyTsReplacement);
+        _updateExecutor = std::make_unique<ObjectReplaceExecutor>(updateMod.getUpdateReplacement());
 
         // Register the fact that this driver will only do full object replacements.
         _updateType = UpdateType::kReplacement;