diff options
author | Nay <dnpd.dd@gmail.com> | 2013-08-25 14:12:32 +0100 |
---|---|---|
committer | Nay <dnpd.dd@gmail.com> | 2013-08-25 14:12:32 +0100 |
commit | a7527b3b48ba864e923e5200b55879b48e552681 (patch) | |
tree | 059602de88fae48ef5ef374e7159d11f09b249d1 /src/server/shared/Database/QueryResult.cpp | |
parent | 0d44191a834d65f68f367ec26001cc2823b41f51 (diff) | |
parent | ee3d3ab1ff5589036c41c236e4fc376f11854467 (diff) |
Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
src/server/game/Spells/SpellMgr.cpp
src/server/scripts/Commands/cs_debug.cpp
src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp
src/tools/map_extractor/mpq_libmpq04.h
Diffstat (limited to 'src/server/shared/Database/QueryResult.cpp')
-rw-r--r-- | src/server/shared/Database/QueryResult.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/server/shared/Database/QueryResult.cpp b/src/server/shared/Database/QueryResult.cpp index 4f4c0ec51f4..9413e28a0c0 100644 --- a/src/server/shared/Database/QueryResult.cpp +++ b/src/server/shared/Database/QueryResult.cpp @@ -60,6 +60,9 @@ m_length(NULL) if (mysql_stmt_store_result(m_stmt)) { TC_LOG_WARN(LOG_FILTER_SQL, "%s:mysql_stmt_store_result, cannot bind result from MySQL server. Error: %s", __FUNCTION__, mysql_stmt_error(m_stmt)); + delete[] m_rBind; + delete[] m_isNull; + delete[] m_length; return; } |