summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHana Pearlman <hana.pearlman@mongodb.com>2021-04-16 14:13:43 +0000
committerHana Pearlman <hana.pearlman@mongodb.com>2021-04-16 14:13:48 +0000
commita3d9c52375c4902f9c11755c68ff350fc8bcd6d6 (patch)
tree83ae5d312ba0aece2f71f3ea0addac7fd5c1daa9
parent9193a7d1fb2d8a916e310c708c0d68e2c7c1eb53 (diff)
parentf37dc54f9f5b2e44aaeecb42f18ce990d680501f (diff)
downloadmongo-a3d9c52375c4902f9c11755c68ff350fc8bcd6d6.tar.gz
Small typo fix
-rw-r--r--src/mongo/db/query/get_executor.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/mongo/db/query/get_executor.cpp b/src/mongo/db/query/get_executor.cpp
index 36179df5791..138bf322d71 100644
--- a/src/mongo/db/query/get_executor.cpp
+++ b/src/mongo/db/query/get_executor.cpp
@@ -221,8 +221,12 @@ 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);
}