1 files changed, 32 insertions, 4 deletions
diff --git a/src/server/worldserver/CommandLine/CliRunnable.cpp b/src/server/worldserver/CommandLine/CliRunnable.cpp
index d105f29f3c2..e44ec1ada94 100644
--- a/src/server/worldserver/CommandLine/CliRunnable.cpp
+++ b/src/server/worldserver/CommandLine/CliRunnable.cpp
@@ -690,8 +690,28 @@ int kb_hit_return()
 /// %Thread start
 void CliRunnable::run()
 {
-    ///- Init new SQL thread for the world database (one connection call enough)
-    WorldDatabase.ThreadStart();                                // let thread do safe mySQL requests
+    ///- Init MySQL threads or connections
+    bool needInit = true;
+    if (!(sWorld.getConfig(CONFIG_MYSQL_BUNDLE_WORLDDB) & MYSQL_BUNDLE_RA))
+    {
+        WorldDatabase.Init_MySQL_Connection();
+        needInit = false;
+    }
+
+    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();
 
     char commandbuf[256];
 
@@ -759,6 +779,14 @@ void CliRunnable::run()
 
     }
 
-    ///- End the database thread
-    WorldDatabase.ThreadEnd();                                  // free mySQL thread resources
+    ///- Free MySQL thread resources and deallocate lingering connections
+    if (!(sWorld.getConfig(CONFIG_MYSQL_BUNDLE_WORLDDB) & MYSQL_BUNDLE_RA))
+        WorldDatabase.End_MySQL_Connection();
+    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();
 }