diff options
| author | Tess Avitabile <tess.avitabile@mongodb.com> | 2016-09-07 18:08:13 -0400 |
|---|---|---|
| committer | Tess Avitabile <tess.avitabile@mongodb.com> | 2016-09-07 18:08:13 -0400 |
| commit | 410fefd45f65e7899d60ed420a81d6127d687fa8 (patch) | |
| tree | 0e77b2ace8c9507bcd95a3b6c0dd73e347bcef1b /src/mongo/db/catalog | |
| parent | 5559f16e634af69bcbcc4f8dd6d03e74a40729b9 (diff) | |
| download | mongo-410fefd45f65e7899d60ed420a81d6127d687fa8.tar.gz | |
Revert "SERVER-25741 Disallow collection default collation if featureCompatibilityVersion is 3.2"
This reverts commit 5559f16e634af69bcbcc4f8dd6d03e74a40729b9.
Diffstat (limited to 'src/mongo/db/catalog')
| -rw-r--r-- | src/mongo/db/catalog/database.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/mongo/db/catalog/database.cpp b/src/mongo/db/catalog/database.cpp index 1895acb15f7..feb4111edac 100644 --- a/src/mongo/db/catalog/database.cpp +++ b/src/mongo/db/catalog/database.cpp @@ -683,14 +683,6 @@ Status userCreateNS(OperationContext* txn, // Validate the collation, if there is one. if (!collectionOptions.collation.isEmpty()) { - if (serverGlobalParams.featureCompatibilityVersion.load() == - ServerGlobalParams::FeatureCompatibilityVersion_32) { - return Status(ErrorCodes::InvalidOptions, - "The featureCompatibilityVersion must be 3.4 to create a collection or " - "view with a default collation. See " - "http://dochub.mongodb.org/core/3.4-feature-compatibility."); - } - auto collator = CollatorFactoryInterface::get(txn->getServiceContext()) ->makeFromBSON(collectionOptions.collation); if (!collator.isOK()) { |