aboutsummaryrefslogtreecommitdiff
path: root/src/server/database/Database/Transaction.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/server/database/Database/Transaction.cpp')
-rw-r--r--src/server/database/Database/Transaction.cpp11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/server/database/Database/Transaction.cpp b/src/server/database/Database/Transaction.cpp
index 52f7062c78a..740e0455881 100644
--- a/src/server/database/Database/Transaction.cpp
+++ b/src/server/database/Database/Transaction.cpp
@@ -15,14 +15,15 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "DatabaseEnv.h"
#include "Transaction.h"
+#include "MySQLConnection.h"
+#include "PreparedStatement.h"
#include <mysqld_error.h>
std::mutex TransactionTask::_deadlockLock;
//- Append a raw ad-hoc query to the transaction
-void Transaction::Append(const char* sql)
+void Transaction::Append(char const* sql)
{
SQLElementData data;
data.type = SQL_ELEMENT_RAW;
@@ -45,9 +46,8 @@ void Transaction::Cleanup()
if (_cleanedUp)
return;
- while (!m_queries.empty())
+ for (SQLElementData const& data : m_queries)
{
- SQLElementData const &data = m_queries.front();
switch (data.type)
{
case SQL_ELEMENT_PREPARED:
@@ -57,10 +57,9 @@ void Transaction::Cleanup()
free((void*)(data.element.query));
break;
}
-
- m_queries.pop_front();
}
+ m_queries.clear();
_cleanedUp = true;
}