* Merge.

--HG--
branch : trunk

src/trinitycore/Master.cpp

@@ -464,8 +464,14 @@ bool Master::_StartDB()
     {
         // everything successful - set var to enable DB logging once startup finished.
         sLog.SetLogDBLater(true);
+        sLog.SetLogDB(false);
         sLog.SetRealmID(realmID);
     }
+    else
+    {
+        sLog.SetLogDBLater(false);
+        sLog.SetLogDB(false);
+    }
 
     ///- Clean the database before starting
     clearOnlineAccounts();