From df70a2c81d623b84114c6db65116193ad00a4ae9 Mon Sep 17 00:00:00 2001
From: VladimirMangos <vladimir@getmangos.com>
Date: Sat, 30 Jan 2010 17:59:18 +0300
Subject: [PATCH] [9272] Revert "[9265] * Call
 Database::ThreadStart()/ThreadEnd() for all DBs."

This reverts commit af146f14c0999eed0e293bc0595a04e62df54f3e.

Not need call this function more that one per thread.
---
 src/game/WorldSocketMgr.cpp   | 8 ++------
 src/mangosd/CliRunnable.cpp   | 4 ----
 src/mangosd/WorldRunnable.cpp | 5 -----
 src/shared/revision_nr.h      | 2 +-
 4 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/src/game/WorldSocketMgr.cpp b/src/game/WorldSocketMgr.cpp
index add505e2f..24a54a752 100644
--- a/src/game/WorldSocketMgr.cpp
+++ b/src/game/WorldSocketMgr.cpp
@@ -152,9 +152,7 @@ class ReactorRunnable : protected ACE_Task_Base
         {
             DEBUG_LOG ("Network Thread Starting");
 
-            WorldDatabase.ThreadStart();
-            CharacterDatabase.ThreadStart();
-            loginDatabase.ThreadStart();
+            WorldDatabase.ThreadStart ();
 
             ACE_ASSERT (m_Reactor);
 
@@ -187,9 +185,7 @@ class ReactorRunnable : protected ACE_Task_Base
                 }
             }
 
-            WorldDatabase.ThreadEnd();
-            CharacterDatabase.ThreadEnd();
-            loginDatabase.ThreadEnd();
+            WorldDatabase.ThreadEnd ();
 
             DEBUG_LOG ("Network Thread Exitting");
 
diff --git a/src/mangosd/CliRunnable.cpp b/src/mangosd/CliRunnable.cpp
index 4ae90ce32..4658db59a 100644
--- a/src/mangosd/CliRunnable.cpp
+++ b/src/mangosd/CliRunnable.cpp
@@ -294,8 +294,6 @@ 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];
 
@@ -354,6 +352,4 @@ 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
index b140bcb24..4575a6e31 100644
--- a/src/mangosd/WorldRunnable.cpp
+++ b/src/mangosd/WorldRunnable.cpp
@@ -42,9 +42,6 @@ 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;
@@ -93,6 +90,4 @@ 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
index 060028672..3d0b09032 100644
--- 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 "9271"
+ #define REVISION_NR "9272"
 #endif // __REVISION_NR_H__