Merge commit 'upstream/1.8.3'

1 files changed, 6 insertions, 0 deletions

diff --git a/client/dbclient_rs.h b/client/dbclient_rs.h
index e942d7b..548b46a 100644
--- a/client/dbclient_rs.h
+++ b/client/dbclient_rs.h
@@ -215,6 +215,9 @@ namespace mongo {
         /* this is the callback from our underlying connections to notify us that we got a "not master" error.
          */
         void isntMaster();
+        /* this is used to indicate we got a "not master or secondary" error from a secondary.
+         */
+        void isntSecondary();
 
         // ----- status ------
 
@@ -240,6 +243,9 @@ namespace mongo {
 
     private:
 
+        // Used to simplify slave-handling logic on errors
+        auto_ptr<DBClientCursor> checkSlaveQueryResult( auto_ptr<DBClientCursor> result );
+
         DBClientConnection * checkMaster();
         DBClientConnection * checkSlave();