[9265] * Call Database::ThreadStart()/ThreadEnd() for all DBs.

mangos · Jan 29, 2010 · af146f1 · af146f1 · Omeprazol · Jan 29, 2010
1 parent 184f565
commit af146f1
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 3 deletions.
diff --git a/src/game/WorldSocketMgr.cpp b/src/game/WorldSocketMgr.cpp
@@ -152,7 +152,9 @@ class ReactorRunnable : protected ACE_Task_Base
         {
             DEBUG_LOG ("Network Thread Starting");
 
-            WorldDatabase.ThreadStart ();
+            WorldDatabase.ThreadStart();
+            CharacterDatabase.ThreadStart();
+            loginDatabase.ThreadStart();
 
             ACE_ASSERT (m_Reactor);
 
@@ -185,7 +187,9 @@ class ReactorRunnable : protected ACE_Task_Base
                 }
             }
 
-            WorldDatabase.ThreadEnd ();
+            WorldDatabase.ThreadEnd();
+            CharacterDatabase.ThreadEnd();
+            loginDatabase.ThreadEnd();
 
             DEBUG_LOG ("Network Thread Exitting");
 

diff --git a/src/mangosd/CliRunnable.cpp b/src/mangosd/CliRunnable.cpp
@@ -294,6 +294,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];
 
@@ -352,4 +354,6 @@ void CliRunnable::run()
 
     ///- End the database thread
     WorldDatabase.ThreadEnd();                                  // free mySQL thread resources
+    CharacterDatabase.ThreadEnd();
+    loginDatabase.ThreadEnd();
 }
diff --git a/src/mangosd/WorldRunnable.cpp b/src/mangosd/WorldRunnable.cpp
@@ -42,6 +42,9 @@ void WorldRunnable::run()
 {
     ///- Init new SQL thread for the world database
     WorldDatabase.ThreadStart();                                // let thread do safe mySQL requests (one connection call enough)
+    CharacterDatabase.ThreadStart();
+    loginDatabase.ThreadStart();
+
     sWorld.InitResultQueue();
 
     uint32 realCurrTime = 0;
@@ -90,4 +93,6 @@ void WorldRunnable::run()
 
     ///- End the database thread
     WorldDatabase.ThreadEnd();                                  // free mySQL thread resources
+    CharacterDatabase.ThreadEnd();
+    loginDatabase.ThreadEnd();
 }
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "9264"
+ #define REVISION_NR "9265"
 #endif // __REVISION_NR_H__