Merge branch 'SERVER-5384'

jstests/mr_noscripting.js

@@ -0,0 +1,24 @@
+var conn = MongoRunner.runMongod({ noscripting: '' });
+var testDB = conn.getDB( 'foo' );
+var coll = testDB.bar;
+
+coll.insert({ x: 1 });
+
+var map = function() {
+    emit( this.x, 1 );
+};
+
+var reduce = function( key, values ) {
+    return 1;
+};
+
+var mrResult = testDB.runCommand({ mapReduce: 'bar', map: map, reduce: reduce,
+                                   out: { inline: 1 }});
+
+assert.eq( 0, mrResult.ok, 'mr result: ' + tojson( mrResult ));
+
+// Confirm that mongod did not crash
+var cmdResult = testDB.adminCommand({ serverStatus: 1 });
+assert( cmdResult.ok, 'serverStatus failed, result: ' +
+        tojson( cmdResult ));
+

src/mongo/db/commands/mr.cpp

@@ -1001,6 +1001,8 @@ namespace mongo {
 
                 log(1) << "mr ns: " << config.ns << endl;
 
+                uassert( 16149 , "cannot run map reduce without the js engine", globalScriptEngine );
+
                 auto_ptr<ClientCursor> holdCursor;
                 ShardChunkManagerPtr chunkManager;