summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharlie Swanson <charlie.swanson@mongodb.com>2020-09-10 18:17:42 -0400
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2020-09-11 16:50:11 +0000
commitb39aecbdf43f463832739d7415d59958619b8cff (patch)
tree286275b781a38b98bee044683c00f214e4eebf31
parent1373280c254a39d2ca7d85563718a6f74c927216 (diff)
downloadmongo-b39aecbdf43f463832739d7415d59958619b8cff.tar.gz
SERVER-50764 Fix bad merge conflict - add break;
-rw-r--r--src/mongo/db/query/query_planner.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/mongo/db/query/query_planner.cpp b/src/mongo/db/query/query_planner.cpp
index 64d11a517fc..3f11099d0a4 100644
--- a/src/mongo/db/query/query_planner.cpp
+++ b/src/mongo/db/query/query_planner.cpp
@@ -175,6 +175,7 @@ string optionString(size_t options) {
break;
case QueryPlannerParams::ASSERT_MIN_TS_HAS_NOT_FALLEN_OFF_OPLOG:
ss << "ASSERT_MIN_TS_HAS_NOT_FALLEN_OFF_OPLOG ";
+ break;
case QueryPlannerParams::ENUMERATE_OR_CHILDREN_LOCKSTEP:
ss << "ENUMERATE_OR_CHILDREN_LOCKSTEP ";
break;