2 files changed, 4 insertions, 4 deletions
diff --git a/src/server/shared/Database/DatabaseWorkerPool.h b/src/server/shared/Database/DatabaseWorkerPool.h
index 4045a9bc421..f7e899eae0c 100644
--- a/src/server/shared/Database/DatabaseWorkerPool.h
+++ b/src/server/shared/Database/DatabaseWorkerPool.h
@@ -288,14 +288,14 @@ class DatabaseWorkerPool
 
         MySQLThreadBundle GetBundleMask() { return m_bundleMask; } 
 
-        PreparedResultSet* Query(PreparedStatement* stmt)
+        PreparedQueryResult Query(PreparedStatement* stmt)
         {
             PreparedResultSet* ret = GetConnection()->Query(stmt);
             if (!ret || !ret->num_rows)
-                return NULL;
+                return PreparedQueryResult(NULL);
 
             ret->NextRow();
-            return ret;
+            return PreparedQueryResult(ret);
         }
 
     private:
diff --git a/src/server/shared/Database/QueryResult.h b/src/server/shared/Database/QueryResult.h
index 4aa08bfcb93..6dca51fddc1 100755
--- a/src/server/shared/Database/QueryResult.h
+++ b/src/server/shared/Database/QueryResult.h
@@ -224,7 +224,7 @@ class PreparedResultSet
         uint32 num_rows;
 };
 
-typedef ACE_Refcounted_Auto_Ptr<PreparedResultSet*, ACE_Null_Mutex> PreparedQueryResult;
+typedef ACE_Refcounted_Auto_Ptr<PreparedResultSet, ACE_Null_Mutex> PreparedQueryResult;
 
 #endif