diff options
author | DDuarte <dnpd.dd@gmail.com> | 2014-07-22 13:15:36 +0100 |
---|---|---|
committer | DDuarte <dnpd.dd@gmail.com> | 2014-07-22 13:15:36 +0100 |
commit | 01d9681a4d75be566f359f54fc37173b043befdf (patch) | |
tree | da097e38d1c4f7b71b929ba6477156d5b5da3171 /src/server/shared/Database/PreparedStatement.cpp | |
parent | 4f6db255a23b8d321bea2265295fd09ba3095833 (diff) | |
parent | 44c0d66d63f58a022045efbb6cff6e1278f6a8cb (diff) |
Merge branch 'master' into 4.3.4
Conflicts:
src/server/authserver/Realms/RealmList.cpp
src/server/scripts/EasternKingdoms/zone_ironforge.cpp
Diffstat (limited to 'src/server/shared/Database/PreparedStatement.cpp')
-rw-r--r-- | src/server/shared/Database/PreparedStatement.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/shared/Database/PreparedStatement.cpp b/src/server/shared/Database/PreparedStatement.cpp index fb1bfa687d0..23c50ac2ef8 100644 --- a/src/server/shared/Database/PreparedStatement.cpp +++ b/src/server/shared/Database/PreparedStatement.cpp @@ -446,8 +446,8 @@ std::string MySQLPreparedStatement::getQueryString(std::string const& sqlPattern //- Execution PreparedStatementTask::PreparedStatementTask(PreparedStatement* stmt, bool async) : -m_stmt(stmt) -{ +m_stmt(stmt), m_result(nullptr) +{ m_has_result = async; // If it's async, then there's a result if (async) m_result = new PreparedQueryResultPromise(); |