SERVER-15812 Rename PlanExecutor::EXEC_ERROR to PlanExecutor::FAILURE

Done in order to be consistent with PlanStage::StageState. Also cleans up use of PlanStage::DEAD
in the IDHackStage.

2 files changed, 2 insertions, 2 deletions

diff --git a/src/mongo/db/commands/collection_to_capped.cpp b/src/mongo/db/commands/collection_to_capped.cpp
index 19b961a3e52..6cda6aa1c3a 100644
--- a/src/mongo/db/commands/collection_to_capped.cpp
+++ b/src/mongo/db/commands/collection_to_capped.cpp
@@ -105,7 +105,7 @@ namespace {
             case PlanExecutor::DEAD:
                 db->dropCollection( txn, toNs );
                 return Status( ErrorCodes::InternalError, "executor turned dead while iterating" );
-            case PlanExecutor::EXEC_ERROR:
+            case PlanExecutor::FAILURE:
                 return Status( ErrorCodes::InternalError, "executor error while iterating" );
             case PlanExecutor::ADVANCED:
                 if ( excessSize > 0 ) {
diff --git a/src/mongo/db/commands/group.cpp b/src/mongo/db/commands/group.cpp
index 654ff73001b..08a7701b7a7 100644
--- a/src/mongo/db/commands/group.cpp
+++ b/src/mongo/db/commands/group.cpp
@@ -153,7 +153,7 @@ namespace mongo {
         BSONObj retval;
         PlanExecutor::ExecState state = planExecutor->getNext(&retval, NULL);
         if (PlanExecutor::ADVANCED != state) {
-            if (PlanExecutor::EXEC_ERROR == state &&
+            if (PlanExecutor::FAILURE == state &&
                 WorkingSetCommon::isValidStatusMemberObject(retval)) {
                 return appendCommandStatus(out, WorkingSetCommon::getMemberObjectStatus(retval));
             }