Merge branch 'master' of https://github.com/schaermu/node-mongodb-native into schaermu-master

Author: christkv

lib/mongodb/collection.js

@@ -494,10 +494,18 @@ Collection.prototype.mapReduce = function(map, reduce, options, callback) {
  if(err == null && result.documents[0].ok == 1) {
  // Create a collection object that wraps the result collection
  self.db.collection(result.documents[0].result, function(err, collection) {
- callback(err, collection);
+ if(options.include_statistics) {
+ var stats = {
+ processtime: result.documents[0].timeMillis,
+ counts: result.documents[0].counts
+ };
+ callback(err, collection, stats);
+ } else {
+ callback(err, collection);
+ }
  });
  } else {
- err != null ? callback(err, null) : callback(new Error("map-reduce failed: " + result.documents[0].errmsg), null);
+ err != null ? callback(err, null, null) : callback(new Error("map-reduce failed: " + result.documents[0].errmsg), null, null);
  }
  });
 };