From 402198c5ff06c30fcbafc54e704a5e44e4911477 Mon Sep 17 00:00:00 2001
From: Machiavelli <machiavelli.trinity@gmail.com>
Date: Mon, 23 May 2011 16:33:33 +0200
Subject: Core/DBLayer: Proper core-side handling of MySQL errno 1213 to
 prevent a snowballeffect (until innodb_lock_wait_timeout)

---
 src/server/shared/Database/Transaction.h | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'src/server/shared/Database/Transaction.h')

diff --git a/src/server/shared/Database/Transaction.h b/src/server/shared/Database/Transaction.h
index cea3b734c24..1537f238f37 100755
--- a/src/server/shared/Database/Transaction.h
+++ b/src/server/shared/Database/Transaction.h
@@ -30,7 +30,7 @@ class Transaction
     friend class MySQLConnection;
 
     public:
-        Transaction() {}
+        Transaction() : _cleanedUp(false) {}
         ~Transaction() { Cleanup(); }
 
         void Append(PreparedStatement* statement);
@@ -41,7 +41,10 @@ class Transaction
 
     protected:
         void Cleanup();
-        std::queue<SQLElementData> m_queries;
+        std::list<SQLElementData> m_queries;
+
+    private:
+        bool _cleanedUp;
 
 };
 typedef ACE_Refcounted_Auto_Ptr<Transaction, ACE_Null_Mutex> SQLTransaction;
-- 
cgit v1.2.3