diff options
| author | Max Hirschhorn <max.hirschhorn@mongodb.com> | 2016-09-09 17:24:49 -0400 |
|---|---|---|
| committer | Max Hirschhorn <max.hirschhorn@mongodb.com> | 2016-09-09 17:24:49 -0400 |
| commit | 5adc47945eaec50a7bf502fe842473bd7ceae5f6 (patch) | |
| tree | 164f4fb65bb338268804c771620b838eee2240cf /src/mongo/db/catalog | |
| parent | 53c412f3e4ca97ba19a2d290bcaed0526f2b561b (diff) | |
| download | mongo-5adc47945eaec50a7bf502fe842473bd7ceae5f6.tar.gz | |
SERVER-25741 Move check for "collation" option into CmdCreate::run().
The userCreateNS() function is used by replication in the 3.2 codepath
for initial sync.
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()) { |