aboutsummaryrefslogtreecommitdiff
path: root/src/server/shared/Database
diff options
context:
space:
mode:
authorMachiavelli <none@none>2010-09-11 21:22:15 +0200
committerMachiavelli <none@none>2010-09-11 21:22:15 +0200
commit1de7e5bed179a2c1bcaf7cdb68fb377c39afd51a (patch)
tree3b70e65e5b3150e72bc274d868c0f92376296fe4 /src/server/shared/Database
parenta41e99223e1dfe707afd0fa8004bcb6f267f0f04 (diff)
Core/DBLayer:
* Example implementation of prepared statements with resultset in RealmList and AuthSocket code (selectively) * Also correct a few bobo´s from previous commit. --HG-- branch : trunk
Diffstat (limited to 'src/server/shared/Database')
-rw-r--r--src/server/shared/Database/DatabaseWorkerPool.h6
-rwxr-xr-xsrc/server/shared/Database/QueryResult.h2
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