diff options
| author | Hari Khalsa <hkhalsa@10gen.com> | 2013-10-09 11:22:17 -0400 |
|---|---|---|
| committer | Hari Khalsa <hkhalsa@10gen.com> | 2013-10-09 11:22:17 -0400 |
| commit | 9ebc833bd9966a83b4dc4f83a0e4c2de422e1846 (patch) | |
| tree | abbadaa3fa71b9c61ab1a3f1dd5ef3e183921a22 /src | |
| parent | 24031eede8fbc6cf75a1854f7a1427d05da8746f (diff) | |
| download | mongo-9ebc833bd9966a83b4dc4f83a0e4c2de422e1846.tar.gz | |
SERVER-10471 fix tree traversal code and build
Diffstat (limited to 'src')
| -rw-r--r-- | src/mongo/db/query/query_planner_common.h | 1 | ||||
| -rw-r--r-- | src/mongo/db/query/query_planner_test.cpp | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/mongo/db/query/query_planner_common.h b/src/mongo/db/query/query_planner_common.h index 94c1c88ed18..7be7328716b 100644 --- a/src/mongo/db/query/query_planner_common.h +++ b/src/mongo/db/query/query_planner_common.h @@ -48,7 +48,6 @@ namespace mongo { for (size_t i = 0; i < root->numChildren(); ++i) { if (hasNode(root->getChild(i), type)) { - *out = root->getChild(i); return true; } } diff --git a/src/mongo/db/query/query_planner_test.cpp b/src/mongo/db/query/query_planner_test.cpp index 17f3b44edbb..3e50c7e5626 100644 --- a/src/mongo/db/query/query_planner_test.cpp +++ b/src/mongo/db/query/query_planner_test.cpp @@ -66,7 +66,7 @@ namespace { } void addIndex(BSONObj keyPattern, bool multikey, bool sparse) { - keyPatterns.push_back(IndexEntry(keyPattern, multikey, sparse)); + keyPatterns.push_back(IndexEntry(keyPattern, multikey, sparse, "note_to_self_dont_break_build")); } // |