From 8f726a40b832928200c147b963378a9a52d00cac Mon Sep 17 00:00:00 2001
From: Eliot Horowitz <eliot@10gen.com>
Date: Mon, 15 Nov 2010 17:23:28 -0500
Subject: [PATCH] fix sharded outType

---
 db/commands/mr.cpp    | 6 +++++-
 s/commands_public.cpp | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/db/commands/mr.cpp b/db/commands/mr.cpp
index 6398ed7bc7f..58d8ab65660 100644
--- a/db/commands/mr.cpp
+++ b/db/commands/mr.cpp
@@ -720,7 +720,11 @@ namespace mongo {
                 }
                 
 
-                long long finalCount = mr.renameIfNeeded( db , &state );
+                long long finalCount;
+                {
+                    dblock lk;
+                    finalCount = mr.renameIfNeeded( db , &state );
+                }
                 log(0) << " mapreducefinishcommand " << mr.finalLong << " " << finalCount << endl;
 
                 for ( set<ServerAndQuery>::iterator i=servers.begin(); i!=servers.end(); i++ ){
diff --git a/s/commands_public.cpp b/s/commands_public.cpp
index 2b518828ac2..4a4e433e785 100644
--- a/s/commands_public.cpp
+++ b/s/commands_public.cpp
@@ -844,6 +844,7 @@ namespace mongo {
                     }
                     else if ( fn == "keeptemp" ||
                               fn == "out" ||
+                              fn == "outType" ||
                               fn == "finalize" ){
                         // we don't want to copy these
                     }