SERVER-12398 bubble error from plan stages to runner

1 files changed, 5 insertions, 1 deletions

diff --git a/src/mongo/db/exec/merge_sort.cpp b/src/mongo/db/exec/merge_sort.cpp
index 8e17a1e3e2e..52d1c00bd67 100644
--- a/src/mongo/db/exec/merge_sort.cpp
+++ b/src/mongo/db/exec/merge_sort.cpp
@@ -63,7 +63,7 @@ namespace mongo {
             // We have some child that we don't have a result from.  Each child must have a result
             // in order to pick the minimum result among all our children.  Work a child.
             PlanStage* child = _noResultToMerge.front();
-            WorkingSetID id;
+            WorkingSetID id = WorkingSet::INVALID_ID;
             StageState code = child->work(&id);
 
             if (PlanStage::ADVANCED == code) {
@@ -120,6 +120,10 @@ namespace mongo {
                 ++_commonStats.needTime;
                 return PlanStage::NEED_TIME;
             }
+            else if (PlanStage::FAILURE == code) {
+                *out = id;
+                return code;
+            }
             else {
                 if (PlanStage::NEED_FETCH == code) {
                     *out = id;