SERVER-2111 Synchronize db names with master if a case conflict is detected in replication

1 files changed, 5 insertions, 1 deletions

diff --git a/db/cloner.h b/db/cloner.h
index 3e6041218a5..94264f85e58 100644
--- a/db/cloner.h
+++ b/db/cloner.h
@@ -16,6 +16,8 @@
  *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#pragma once
+
 #include "jsobj.h"
 
 namespace mongo {
@@ -25,10 +27,12 @@ namespace mongo {
      * @param useReplAuth - use the credentials we normally use as a replication slave for the cloning
      * @param snapshot    - use $snapshot mode for copying collections.  note this should not be used when it isn't required, as it will be slower.
      *                      for example repairDatabase need not use it.
+     * @param errCode     - If provided, this will be set on error to the server's error code.  Currently
+     *                      this will only be set if there is an error in the initial system.namespaces query.
      */
     bool cloneFrom(const char *masterHost, string& errmsg, const string& fromdb, bool logForReplication,
                    bool slaveOk, bool useReplAuth, bool snapshot, bool mayYield,
-                   bool mayBeInterrupted);
+                   bool mayBeInterrupted, int *errCode = 0);
 
     bool copyCollectionFromRemote(const string& host, const string& ns, const BSONObj& query, string& errmsg, bool logForRepl, bool mayYield, bool mayBeInterrupted);