Merge remote-tracking branch 'origin/master' into 4.3.4

Conflicts:
	src/server/game/Handlers/GroupHandler.cpp

1 files changed, 1 insertions, 0 deletions

diff --git a/src/server/shared/Database/PreparedStatement.cpp b/src/server/shared/Database/PreparedStatement.cpp
index 08b554ff696..76dc7206bd7 100755
--- a/src/server/shared/Database/PreparedStatement.cpp
+++ b/src/server/shared/Database/PreparedStatement.cpp
@@ -445,6 +445,7 @@ bool PreparedStatementTask::Execute()
         PreparedResultSet* result = m_conn->Query(m_stmt);
         if (!result || !result->GetRowCount())
         {
+            delete result;
             m_result.set(PreparedQueryResult(NULL));
             return false;
         }