diff options
| -rw-r--r-- | src/server/shared/Database/DatabaseWorkerPool.cpp | 2 | ||||
| -rw-r--r-- | src/server/shared/Database/MySQLConnection.cpp | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/server/shared/Database/DatabaseWorkerPool.cpp b/src/server/shared/Database/DatabaseWorkerPool.cpp index 6ec4b9d3870..538a3535efd 100644 --- a/src/server/shared/Database/DatabaseWorkerPool.cpp +++ b/src/server/shared/Database/DatabaseWorkerPool.cpp @@ -258,7 +258,7 @@ MySQLConnection* DatabaseWorkerPool::GetConnection() ACE_Guard<ACE_Thread_Mutex> guard(m_connectionMap_mtx); itr = m_sync_connections.find(ACE_Based::Thread::current()); if (itr != m_sync_connections.end()) - conn = itr->second; + return itr->second; } /*! Bundled threads */ conn = m_bundle_conn; diff --git a/src/server/shared/Database/MySQLConnection.cpp b/src/server/shared/Database/MySQLConnection.cpp index 51b6d649bb0..9f16cbdf414 100644 --- a/src/server/shared/Database/MySQLConnection.cpp +++ b/src/server/shared/Database/MySQLConnection.cpp @@ -26,7 +26,9 @@ #include "Timer.h" MySQLConnection::MySQLConnection() : -m_Mysql(NULL) +m_Mysql(NULL), +m_worker(NULL), +m_queue(NULL) { } |