Merge

--HG--
branch : trunk

2 files changed, 6 insertions, 13 deletions

diff --git a/src/server/authserver/Main.cpp b/src/server/authserver/Main.cpp
index 454cc83fc1b..7f7d2e39561 100755
--- a/src/server/authserver/Main.cpp
+++ b/src/server/authserver/Main.cpp
@@ -344,15 +344,15 @@ bool StartDB()
         worker_threads = 1;
     }
 
-    uint8 connections = sConfig.GetIntDefault("LoginDatabase.Connections", 2);
-    if (connections < 1 || connections > 32)
+    uint8 synch_threads = sConfig.GetIntDefault("LoginDatabase.SynchThreads", 1);
+    if (synch_threads < 1 || synch_threads > 32)
     {
-        sLog.outError("Improper value specified for LoginDatabase.Connections, defaulting to 2.");
-        connections = 2;
+        sLog.outError("Improper value specified for LoginDatabase.SynchThreads, defaulting to 1.");
+        synch_threads = 1;
     }
 
     /// NOTE: While authserver is singlethreaded you should keep synch_threads == 1. Increasing it is just silly since only 1 will be used ever.
-    if (!LoginDatabase.Open(dbstring.c_str(), worker_threads, connections))
+    if (!LoginDatabase.Open(dbstring.c_str(), worker_threads, synch_threads))
     {
         sLog.outError("Cannot connect to database");
         return false;
diff --git a/src/server/authserver/authserver.conf.dist b/src/server/authserver/authserver.conf.dist
index aecb0ec1424..6bd1185305c 100644
--- a/src/server/authserver/authserver.conf.dist
+++ b/src/server/authserver/authserver.conf.dist
@@ -224,17 +224,10 @@ LoginDatabaseInfo = "127.0.0.1;3306;trinity;trinity;auth"
 #
 #    LoginDatabase.WorkerThreads
 #        Description: The amount of worker threads spawned to handle asynchronous (delayed) MySQL
-#                     statements. 
+#                     statements. Each worker thread is mirrored with its own connection to the
 #        Default:     1
 
 LoginDatabase.WorkerThreads = 1
 
 #
-#    LoginDatabase.Connections
-#        Description: The amount of MySQL connections spawned.
-#        Default:     1
-
-LoginDatabase.Connections = 1
-
-#
 ###################################################################################################