* HIGHLY EXPERIMENTAL - USE AT OWN RISK *

Database Layer:
- Implement connection pooling: Instead of 1 delay thread per database, you can configure between 1 and 32 worker threads that have a seperate thread in the core and have a seperate connection to the MySQL server (based on raczman/Albator´s database layer for Trinitycore3)
- Implement a configurable thread bundle for synchroneous requests from seperate core threads (see worldserver.conf.dist for more info)
- Every mapupdate thread now has its seperate MySQL connection to the world and characters database
- Drop inconsistent PExecuteLog function - query logging will be implemented CONSISTENTLY later
- Drop current prepared statement interface - this will be done *properly* later
- You´ll need to update your worldserver.conf and authserver.conf
- You´re recommended to make a backup of your databases before using this.
* HIGHLY EXPERIMENTAL - USE AT OWN RISK *
* HIGHLY EXPERIMENTAL - USE AT OWN RISK *
etc.

--HG--
branch : trunk

4 files changed, 28 insertions, 7 deletions

diff --git a/src/server/game/Server/Protocol/Handlers/CharacterHandler.cpp b/src/server/game/Server/Protocol/Handlers/CharacterHandler.cpp
index f25dd5824dc..2a764a366e8 100644
--- a/src/server/game/Server/Protocol/Handlers/CharacterHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/CharacterHandler.cpp
@@ -27,7 +27,7 @@
 #include "WorldSession.h"
 #include "MD5.h"
 #include "DatabaseEnv.h"
-#include "DatabaseImpl.h"
+#include "AsyncDatabaseImpl.h"
 
 #include "ArenaTeam.h"
 #include "Chat.h"
@@ -44,7 +44,7 @@
 #include "Util.h"
 #include "ScriptMgr.h"
 
-class LoginQueryHolder : public SqlQueryHolder
+class LoginQueryHolder : public SQLQueryHolder
 {
     private:
         uint32 m_accountId;
@@ -117,7 +117,7 @@ class CharacterHandler
                 return;
             session->HandleCharEnum(result);
         }
-        void HandlePlayerLoginCallback(QueryResult_AutoPtr /*dummy*/, SqlQueryHolder * holder)
+        void HandlePlayerLoginCallback(QueryResult_AutoPtr /*dummy*/, SQLQueryHolder * holder)
         {
             if (!holder) return;
             WorldSession *session = sWorld.FindSession(((LoginQueryHolder*)holder)->GetAccountId());
diff --git a/src/server/game/Server/Protocol/Handlers/MiscHandler.cpp b/src/server/game/Server/Protocol/Handlers/MiscHandler.cpp
index 2656478f899..79e3374c975 100644
--- a/src/server/game/Server/Protocol/Handlers/MiscHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/MiscHandler.cpp
@@ -21,7 +21,7 @@
 #include "Common.h"
 #include "Language.h"
 #include "DatabaseEnv.h"
-#include "DatabaseImpl.h"
+#include "AsyncDatabaseImpl.h"
 #include "WorldPacket.h"
 #include "Opcodes.h"
 #include "Log.h"
diff --git a/src/server/game/Server/Protocol/Handlers/QueryHandler.cpp b/src/server/game/Server/Protocol/Handlers/QueryHandler.cpp
index 0aa6ded77f0..7cb60435d69 100644
--- a/src/server/game/Server/Protocol/Handlers/QueryHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/QueryHandler.cpp
@@ -21,7 +21,7 @@
 #include "Common.h"
 #include "Language.h"
 #include "DatabaseEnv.h"
-#include "DatabaseImpl.h"
+#include "AsyncDatabaseImpl.h"
 #include "WorldPacket.h"
 #include "WorldSession.h"
 #include "Opcodes.h"
diff --git a/src/server/game/Server/WorldSocketMgr.cpp b/src/server/game/Server/WorldSocketMgr.cpp
index 9a50456919f..1293849c496 100644
--- a/src/server/game/Server/WorldSocketMgr.cpp
+++ b/src/server/game/Server/WorldSocketMgr.cpp
@@ -158,7 +158,21 @@ class ReactorRunnable : protected ACE_Task_Base
         {
             DEBUG_LOG ("Network Thread Starting");
 
-            WorldDatabase.ThreadStart();
+            bool needInit = true;
+            if (!(sWorld.getConfig(CONFIG_MYSQL_BUNDLE_LOGINDB) & MYSQL_BUNDLE_RA))
+            {
+                LoginDatabase.Init_MySQL_Connection();
+                needInit = false;
+            }
+
+            if (!(sWorld.getConfig(CONFIG_MYSQL_BUNDLE_CHARDB) & MYSQL_BUNDLE_RA))
+            {
+                CharacterDatabase.Init_MySQL_Connection();
+                needInit = false;
+            }
+
+            if (needInit)
+                MySQL::Thread_Init();
 
             ACE_ASSERT (m_Reactor);
 
@@ -195,7 +209,14 @@ class ReactorRunnable : protected ACE_Task_Base
                 }
             }
 
-            WorldDatabase.ThreadEnd();
+            ///- Free MySQL thread resources and deallocate lingering connections
+            if (!(sWorld.getConfig(CONFIG_MYSQL_BUNDLE_LOGINDB) & MYSQL_BUNDLE_RA))
+                LoginDatabase.End_MySQL_Connection();
+            if (!(sWorld.getConfig(CONFIG_MYSQL_BUNDLE_CHARDB) & MYSQL_BUNDLE_RA))
+                CharacterDatabase.End_MySQL_Connection();
+
+            if (needInit)
+                MySQL::Thread_End();
 
             DEBUG_LOG ("Network Thread Exitting");