Core/DBLayer:

* Rename QueryResult class to ResultSet
* Rename QueryResult_AutoPtr to QueryResult
* Declare ACE refcounted auto pointer for PreparedResultSet class

--HG--
branch : trunk

1 files changed, 5 insertions, 5 deletions

diff --git a/src/server/shared/Database/MySQLConnection.cpp b/src/server/shared/Database/MySQLConnection.cpp
index 47eeea3646a..51cf3ada1c8 100644
--- a/src/server/shared/Database/MySQLConnection.cpp
+++ b/src/server/shared/Database/MySQLConnection.cpp
@@ -231,10 +231,10 @@ bool MySQLConnection::Execute(PreparedStatement* stmt)
     }
 }
 
-QueryResult_AutoPtr MySQLConnection::Query(const char* sql)
+QueryResult MySQLConnection::Query(const char* sql)
 {
     if (!sql)
-        return QueryResult_AutoPtr(NULL);
+        return QueryResult(NULL);
 
     MYSQL_RES *result = NULL;
     MYSQL_FIELD *fields = NULL;
@@ -242,13 +242,13 @@ QueryResult_AutoPtr MySQLConnection::Query(const char* sql)
     uint32 fieldCount = 0;
 
     if (!_Query(sql, &result, &fields, &rowCount, &fieldCount))
-        return QueryResult_AutoPtr(NULL);
+        return QueryResult(NULL);
 
-    QueryResult *queryResult = new QueryResult(result, fields, rowCount, fieldCount);
+    ResultSet *queryResult = new ResultSet(result, fields, rowCount, fieldCount);
 
     queryResult->NextRow();
 
-    return QueryResult_AutoPtr(queryResult);
+    return QueryResult(queryResult);
 }
 
 bool MySQLConnection::_Query(const char *sql, MYSQL_RES **pResult, MYSQL_FIELD **pFields, uint64* pRowCount, uint32* pFieldCount)