Merge branch 'master' of git@github.com:mongodb/mongo

Conflicts:

	SConstruct
	db/dbinfo.h

1 files changed, 4 insertions, 3 deletions

diff --git a/db/db.h b/db/db.h
index fdd0d9eaa1b..13837d04a7b 100644
--- a/db/db.h
+++ b/db/db.h
@@ -101,9 +101,10 @@ namespace mongo {
         bool justCreated;
         Database *newdb = new Database(cl, justCreated, path);
         databases[key] = newdb;
-        //newdb->finishInit();
         cc().setns(ns, newdb);
 
+        newdb->finishInit();
+
         return justCreated;
     }
 
@@ -136,11 +137,11 @@ namespace mongo {
             locktype = dbMutex.getState();
             assert( locktype );
             if ( locktype > 0 ) {
-				massert("can't temprelease nested write lock", locktype == 1);
+				massert( 10298 , "can't temprelease nested write lock", locktype == 1);
                 dbMutex.unlock();
 			}
             else {
-				massert("can't temprelease nested read lock", locktype == -1);
+				massert( 10299 , "can't temprelease nested read lock", locktype == -1);
                 dbMutex.unlock_shared();
 			}
         }