summaryrefslogtreecommitdiff
path: root/s
diff options
context:
space:
mode:
authoragirbal <antoine@10gen.com>2011-11-29 12:56:46 -0800
committeragirbal <antoine@10gen.com>2011-11-29 12:56:46 -0800
commitf853f0d051106dcbcf480f298d9b45500282bb9a (patch)
tree5502de1726f269f6dbecd49dde6e4d8d9372cc9c /s
parent6d9e1f084ee4150f13ed54d3ba9a261b9d1c9d1a (diff)
downloadmongo-f853f0d051106dcbcf480f298d9b45500282bb9a.tar.gz
SERVER-3627: assert failed in inline mode
Diffstat (limited to 's')
-rw-r--r--s/commands_public.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/s/commands_public.cpp b/s/commands_public.cpp
index 863d7b6df9f..5a9e3559029 100644
--- a/s/commands_public.cpp
+++ b/s/commands_public.cpp
@@ -1333,7 +1333,11 @@ namespace mongo {
}
// copy some elements from a single result
- result.append(singleResult.getField("result"));
+ // annoying that we have to copy all results for inline, but no way around it
+ if (singleResult.hasField("result"))
+ result.append(singleResult.getField("result"));
+ else if (singleResult.hasField("results"))
+ result.append(singleResult.getField("results"));
BSONObjBuilder countsB(32);
// input stat is determined by aggregate MR job