diff options
| -rw-r--r-- | src/mongo/db/query/get_executor.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/mongo/db/query/get_executor.cpp b/src/mongo/db/query/get_executor.cpp index 138bf322d71..36179df5791 100644 --- a/src/mongo/db/query/get_executor.cpp +++ b/src/mongo/db/query/get_executor.cpp @@ -221,12 +221,8 @@ IndexEntry indexEntryFromIndexCatalogEntry(OperationContext* opCtx, indexKeys.end(), std::inserter(projectedFields, projectedFields.begin())); -<<<<<<< HEAD multikeyPathSet = getWildcardMultikeyPathSet(wam, opCtx, projectedFields, &mkAccessStats); -======= - multikeyPathSet = getWildcardMultikeyPathSet(wam, opCtx, fields, &mkAccessStats); ->>>>>>> f37dc54f9f5b2e44aaeecb42f18ce990d680501f } else { multikeyPathSet = getWildcardMultikeyPathSet(wam, opCtx, &mkAccessStats); } |