Respect autoIndexId option, if set

1 files changed, 7 insertions, 3 deletions

diff --git a/src/mongo/db/pdfile.cpp b/src/mongo/db/pdfile.cpp
index 1f0f0ffeb5c..492fc62c77f 100644
--- a/src/mongo/db/pdfile.cpp
+++ b/src/mongo/db/pdfile.cpp
@@ -313,12 +313,16 @@ namespace mongo {
         NamespaceDetails *d = nsdetails(ns);
         verify(d);
         
-        // make an _id index for all colls, except capped ones in local w/o autoIndexID
-        // (reason for the exception is for the oplog and non-replicated capped colls)
         bool ensure = true;
-        if( newCapped && str::equals( nsToDatabase( ns ).c_str() ,  "local" ) ) {
+
+        // respect autoIndexId if set. otherwise, create an _id index for all colls, except for
+        // capped ones in local w/o autoIndexID (reason for the exception is for the oplog and
+        //  non-replicated capped colls)
+        if( !options.getField( "autoIndexId" ).eoo() ||
+            (newCapped && str::equals( nsToDatabase( ns ).c_str() ,  "local" )) ) {
             ensure = options.getField( "autoIndexId" ).trueValue();
         }
+
         if( ensure ) {
             if( deferIdIndex )
                 *deferIdIndex = true;