summaryrefslogtreecommitdiff
path: root/src/mongo/db/query/plan_enumerator.cpp
diff options
context:
space:
mode:
authorHari Khalsa <hkhalsa@10gen.com>2014-02-10 23:32:24 -0500
committerHari Khalsa <hkhalsa@10gen.com>2014-02-13 15:01:54 -0500
commitabc8fd203e7f3e031bc991e27cf36128e9f5792a (patch)
tree3d85280aa5ebbd3b371368504f2aba448baedff4 /src/mongo/db/query/plan_enumerator.cpp
parent61b71b0c7b0c4f2a7dbe72d7cf773a5ce1fbf44a (diff)
downloadmongo-abc8fd203e7f3e031bc991e27cf36128e9f5792a.tar.gz
SERVER-12354 SERVER-12144 plan compound text correctly
Diffstat (limited to 'src/mongo/db/query/plan_enumerator.cpp')
-rw-r--r--src/mongo/db/query/plan_enumerator.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mongo/db/query/plan_enumerator.cpp b/src/mongo/db/query/plan_enumerator.cpp
index 5058340abd1..9e8798db014 100644
--- a/src/mongo/db/query/plan_enumerator.cpp
+++ b/src/mongo/db/query/plan_enumerator.cpp
@@ -327,7 +327,7 @@ namespace mongo {
// If the index is multikey, we only assign one pred to it. We also skip
// compounding. TODO: is this also true for 2d and 2dsphere indices? can they be
// multikey but still compoundable? (How do we get covering for them?)
- if (thisIndex.multikey) {
+ if (thisIndex.multikey && (INDEX_TEXT != thisIndex.type)) {
indexAssign.preds.push_back(it->second[0]);
indexAssign.positions.push_back(0);
}