SERVER-19543 Propagate IncompatibleCatalogManager error from MultiHostQuery

src/mongo/base/error_codes.err

@@ -143,6 +143,7 @@ error_code("InvalidSSLConfiguration", 140)
 error_code("SSLHandshakeFailed", 141)
 error_code("JSUncatchableError", 142)
 error_code("CursorInUse", 143)
+error_code("IncompatibleCatalogManager", 144)
 
 # Non-sequential error codes (for compatibility only)
 error_code("RecvStaleConfig", 9996)

src/mongo/s/client/multi_host_query.cpp

@@ -249,6 +249,12 @@ bool MultiHostQueryOp::releaseResult_inlock(StatusWith<DBClientCursor*>* nextRes
             ++numReleased;
         } else {
             ++numErrors;
+
+            // End immediately and don't try to combine errors with WrongShardingCatalog.
+            if (result == ErrorCodes::IncompatibleCatalogManager) {
+                *nextResult = result;
+                return true;
+            }
         }
     }