From 1608ebf7bf1c82398fffc1b0ab782f36502b1905 Mon Sep 17 00:00:00 2001 From: Machiavelli Date: Sun, 5 Sep 2010 10:34:46 +0200 Subject: Core/DBLayer: Move some syncrhonisation error prone methods into the guarded scope in MySQLConnection:Execute(PreparedStatement*) --HG-- branch : trunk --- src/server/shared/Database/MySQLConnection.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/server/shared/Database/MySQLConnection.cpp') diff --git a/src/server/shared/Database/MySQLConnection.cpp b/src/server/shared/Database/MySQLConnection.cpp index 64b2cea5d4b..00777d29ac8 100644 --- a/src/server/shared/Database/MySQLConnection.cpp +++ b/src/server/shared/Database/MySQLConnection.cpp @@ -190,14 +190,14 @@ bool MySQLConnection::Execute(PreparedStatement* stmt) return false; uint32 index = stmt->m_index; - MySQLPreparedStatement* m_mStmt = GetPreparedStatement(index); - ASSERT(m_mStmt); // Can only be null if preparation failed, server side error or bad query - m_mStmt->m_stmt = stmt; // Cross reference them for debug output - stmt->m_stmt = m_mStmt; - { // guarded block for thread-safe mySQL request ACE_Guard query_connection_guard(m_Mutex); + + MySQLPreparedStatement* m_mStmt = GetPreparedStatement(index); + ASSERT(m_mStmt); // Can only be null if preparation failed, server side error or bad query + m_mStmt->m_stmt = stmt; // Cross reference them for debug output + stmt->m_stmt = m_mStmt; // TODO: Cleaner way stmt->BindParameters(); -- cgit v1.2.3