SERVER-6802 preserve correct continue-on-error semantics for mongos bulk inserts

Also divides batches into sizes manageable by the WBL

1 files changed, 8 insertions, 3 deletions

diff --git a/src/mongo/db/dbmessage.h b/src/mongo/db/dbmessage.h
index aedd8f50a91..7b0a802a27f 100644
--- a/src/mongo/db/dbmessage.h
+++ b/src/mongo/db/dbmessage.h
@@ -212,13 +212,18 @@ namespace mongo {
 
         const Message& msg() const { return m; }
 
+        const char * markGet() {
+            return nextjsobj;
+        }
+
         void markSet() {
             mark = nextjsobj;
         }
 
-        void markReset() {
-            verify( mark );
-            nextjsobj = mark;
+        void markReset( const char * toMark = 0) {
+            if( toMark == 0 ) toMark = mark;
+            verify( toMark );
+            nextjsobj = toMark;
         }
 
     private: