2 files changed, 4 insertions, 86 deletions
diff --git a/src/server/shared/Database/DatabaseWorker.cpp b/src/server/shared/Database/DatabaseWorker.cpp
index e5e53471b76..0a613a8a139 100644
--- a/src/server/shared/Database/DatabaseWorker.cpp
+++ b/src/server/shared/Database/DatabaseWorker.cpp
@@ -38,14 +38,15 @@ int DatabaseWorker::svc()
     while (1)
     {
         request = (SQLOperation*)(m_queue->dequeue());
-        request->SetConnection(m_conn);
-        if (request->call() == -1)
+        if (!request)
             break;
 
+        request->SetConnection(m_conn);
+        request->call();
+
         delete request;
     }
 
-    delete request;
     delete m_conn;
     return 0;
 }
diff --git a/src/server/shared/Database/DatabaseWorkerPool.cpp b/src/server/shared/Database/DatabaseWorkerPool.cpp
deleted file mode 100644
index 93861354a6b..00000000000
--- a/src/server/shared/Database/DatabaseWorkerPool.cpp
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright (C) 2008-2010 Trinity <http://www.trinitycore.org/>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#include "DatabaseEnv.h"
-#include "DatabaseWorker.h"
-#include "DatabaseWorkerPool.h"
-#include "MySQLConnection.h"
-#include "SQLOperation.h"
-
-DatabaseWorkerPool::
-DatabaseWorkerPool::
-
-
-
-void DatabaseWorkerPool::Close()
-
-
-/*! This function creates a new MySQL connection for every MapUpdate thread
-    and every unbundled task.
- */
-void DatabaseWorkerPool::Init_MySQL_Connection()
-
-
-void DatabaseWorkerPool::End_MySQL_Connection()
-
-
-void DatabaseWorkerPool::Execute(const char* sql)
-
-
-void DatabaseWorkerPool::PExecute(const char* sql, ...)
-{
-    
-}
-
-void DatabaseWorkerPool::DirectExecute(const char* sql)
-{
-    
-}
-
-void DatabaseWorkerPool::DirectPExecute(const char* sql, ...)
-{
-    
-}
-
-QueryResult_AutoPtr DatabaseWorkerPool::Query(const char* sql)
-
-
-QueryResult_AutoPtr DatabaseWorkerPool::PQuery(const char* sql, ...)
-
-
-SQLTransaction DatabaseWorkerPool::BeginTransaction()
-{
-    
-}
-
-void DatabaseWorkerPool::CommitTransaction(SQLTransaction transaction)
-
-
-ACE_Future<QueryResult_AutoPtr> DatabaseWorkerPool::AsyncQuery(const char* sql)
-
-
-ACE_Future<QueryResult_AutoPtr> DatabaseWorkerPool::AsyncPQuery(const char* sql, ...)
-
-
-QueryResultHolderFuture DatabaseWorkerPool::DelayQueryHolder(SQLQueryHolder* holder)
-
-MySQLConnection* DatabaseWorkerPool::GetConnection()
-