summaryrefslogtreecommitdiff
path: root/src/mongo/db/exec/merge_sort.cpp
diff options
context:
space:
mode:
authorJames Wahlin <james.wahlin@10gen.com>2015-04-21 08:50:52 -0400
committerJames Wahlin <james.wahlin@10gen.com>2015-06-09 13:41:37 -0400
commitd690653daadef98652e58131ade8b34114f86ab2 (patch)
treefd38454b9d4bc8d8d64c61334885e40d1644a235 /src/mongo/db/exec/merge_sort.cpp
parent6f9285ba8e37aee90acb9069cfe477db626281c2 (diff)
downloadmongo-d690653daadef98652e58131ade8b34114f86ab2.tar.gz
SERVER-2454 Improve PlanExecutor::DEAD handling
Diffstat (limited to 'src/mongo/db/exec/merge_sort.cpp')
-rw-r--r--src/mongo/db/exec/merge_sort.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mongo/db/exec/merge_sort.cpp b/src/mongo/db/exec/merge_sort.cpp
index 8fdb3ae96eb..6d394ba00d6 100644
--- a/src/mongo/db/exec/merge_sort.cpp
+++ b/src/mongo/db/exec/merge_sort.cpp
@@ -139,7 +139,7 @@ namespace mongo {
++_commonStats.needTime;
return PlanStage::NEED_TIME;
}
- else if (PlanStage::FAILURE == code) {
+ else if (PlanStage::FAILURE == code || PlanStage::DEAD == code) {
*out = id;
// If a stage fails, it may create a status WSM to indicate why it
// failed, in which case 'id' is valid. If ID is invalid, we