Update upstream source from tag 'upstream/6.0.10'debian/6.0.10-1

Update to upstream version '6.0.10'
with Debian dir 2d176fa254eee97b139f712fec5709641335a8c3

1 files changed, 5 insertions, 5 deletions

diff --git a/jstests/sharding/refine_collection_shard_key_basic.js b/jstests/sharding/refine_collection_shard_key_basic.js
index 671493d99ee..7cacc2b6d55 100644
--- a/jstests/sharding/refine_collection_shard_key_basic.js
+++ b/jstests/sharding/refine_collection_shard_key_basic.js
@@ -1,6 +1,8 @@
 //
 // Basic tests for refineCollectionShardKey.
 //
+// Disabled in multiversion, see SERVER-69290 for more details.
+// @tags: [multiversion_incompatible]
 
 (function() {
 'use strict';
@@ -125,11 +127,9 @@ function validateCRUDAfterRefine() {
     assert.eq(4, sessionDB.getCollection(kCollName).findOne({c: -1}).b);
     mongos.setReadPref(null);
 
-    // The full shard key is required when removing documents.
-    assert.writeErrorWithCode(sessionDB.getCollection(kCollName).remove({a: 1, b: 1}, true),
-                              ErrorCodes.ShardKeyNotFound);
-    assert.writeErrorWithCode(sessionDB.getCollection(kCollName).remove({a: -1, b: -1}, true),
-                              ErrorCodes.ShardKeyNotFound);
+    assert.commandWorked(sessionDB.getCollection(kCollName).remove({a: 1, b: 1}, true));
+    assert.commandWorked(sessionDB.getCollection(kCollName).remove({a: -1, b: -1}, true));
+
     assert.commandWorked(sessionDB.getCollection(kCollName).remove({a: 1, b: 2, c: 1, d: 1}, true));
     assert.commandWorked(
         sessionDB.getCollection(kCollName).remove({a: -1, b: 4, c: -1, d: -1}, true));