* Call Database::ThreadStart()/Database::ThreadEnd() for all databases in all threads.

--HG--
branch : trunk

4 files changed, 15 insertions, 2 deletions

diff --git a/src/game/MapUpdater.cpp b/src/game/MapUpdater.cpp
index 61d367ef2e1..501843f8869 100644
--- a/src/game/MapUpdater.cpp
+++ b/src/game/MapUpdater.cpp
@@ -18,6 +18,8 @@ class  WDBThreadStartReq1 : public ACE_Method_Request
     call (void)
     {
         WorldDatabase.ThreadStart();
+        CharacterDatabase.ThreadStart();
+        loginDatabase.ThreadStart();
         return 0;
     }
 };
@@ -31,6 +33,8 @@ class  WDBThreadEndReq1 : public ACE_Method_Request
     call (void)
     {
         WorldDatabase.ThreadEnd();
+        CharacterDatabase.ThreadEnd();
+        loginDatabase.ThreadEnd();
         return 0;
     }
 };
diff --git a/src/game/WorldSocketMgr.cpp b/src/game/WorldSocketMgr.cpp
index b6407219792..b018e7423e2 100644
--- a/src/game/WorldSocketMgr.cpp
+++ b/src/game/WorldSocketMgr.cpp
@@ -154,7 +154,9 @@ class ReactorRunnable : protected ACE_Task_Base
         {
             DEBUG_LOG ("Network Thread Starting");
 
-            WorldDatabase.ThreadStart ();
+            WorldDatabase.ThreadStart();
+            CharacterDatabase.ThreadStart();
+            loginDatabase.ThreadStart();
 
             ACE_ASSERT (m_Reactor);
 
@@ -187,7 +189,9 @@ class ReactorRunnable : protected ACE_Task_Base
                 }
             }
 
-            WorldDatabase.ThreadEnd ();
+            WorldDatabase.ThreadEnd();
+            CharacterDatabase.ThreadEnd();
+            loginDatabase.ThreadEnd();
 
             DEBUG_LOG ("Network Thread Exitting");
 
diff --git a/src/trinitycore/CliRunnable.cpp b/src/trinitycore/CliRunnable.cpp
index 4549ffcf03e..f18d7ca49cb 100644
--- a/src/trinitycore/CliRunnable.cpp
+++ b/src/trinitycore/CliRunnable.cpp
@@ -369,6 +369,8 @@ void CliRunnable::run()
 {
     ///- Init new SQL thread for the world database (one connection call enough)
     WorldDatabase.ThreadStart();                                // let thread do safe mySQL requests
+    CharacterDatabase.ThreadStart();
+    loginDatabase.ThreadStart();
 
     char commandbuf[256];
     bool canflush = true;
@@ -438,4 +440,6 @@ void CliRunnable::run()
 
     ///- End the database thread
     WorldDatabase.ThreadEnd();                                  // free mySQL thread resources
+    CharacterDatabase.ThreadEnd();
+    loginDatabase.ThreadEnd();
 }
diff --git a/src/trinitycore/WorldRunnable.cpp b/src/trinitycore/WorldRunnable.cpp
index 358344e1fed..007107f1eb8 100644
--- a/src/trinitycore/WorldRunnable.cpp
+++ b/src/trinitycore/WorldRunnable.cpp
@@ -47,6 +47,7 @@ void WorldRunnable::run()
     WorldDatabase.ThreadStart();                                // let thread do safe mySQL requests (one connection call enough)
     CharacterDatabase.ThreadStart();
     loginDatabase.ThreadStart();
+
     sWorld.InitResultQueue();
 
     uint32 realCurrTime = 0;