Merge

--HG--
branch : trunk

1 files changed, 9 insertions, 0 deletions

diff --git a/src/server/shared/Database/MySQLConnection.cpp b/src/server/shared/Database/MySQLConnection.cpp
index de05ee311db..20c614b5333 100755
--- a/src/server/shared/Database/MySQLConnection.cpp
+++ b/src/server/shared/Database/MySQLConnection.cpp
@@ -34,11 +34,20 @@
 
 MySQLConnection::MySQLConnection(MySQLConnectionInfo& connInfo) :
 m_queue(NULL),
+m_worker(NULL),
 m_Mysql(NULL),
 m_connectionInfo(connInfo)
 {
 }
 
+MySQLConnection::MySQLConnection(ACE_Activation_Queue* queue, MySQLConnectionInfo& connInfo) :
+m_queue(queue),
+m_Mysql(NULL),
+m_connectionInfo(connInfo)
+{
+    m_worker = new DatabaseWorker(m_queue, this);
+}
+
 MySQLConnection::~MySQLConnection()
 {
     ASSERT (m_Mysql); /// MySQL context must be present at this point