Anonymous

Index: src/game/TradeHandler.cpp
===================================================================
--- src/game/TradeHandler.cpp	(revision 3691)
+++ src/game/TradeHandler.cpp	(working copy)
@@ -295,10 +295,10 @@
         _player->pTrader->ClearTrade();
 
         // desynced with the other saves here (SaveInventoryAndGoldToDB() not have own transaction guards)
-        //sDatabase.BeginTransaction();
+        sDatabase.BeginTransaction();
         _player->SaveInventoryAndGoldToDB();
         _player->pTrader->SaveInventoryAndGoldToDB();
-        //sDatabase.CommitTransaction();
+        sDatabase.CommitTransaction();
 
         _player->pTrader->GetSession()->SendTradeStatus(TRADE_STATUS_TRADE_COMPLETE);
         SendTradeStatus(TRADE_STATUS_TRADE_COMPLETE);
Index: src/shared/Database/Database.h
===================================================================
--- src/shared/Database/Database.h	(revision 3691)
+++ src/shared/Database/Database.h	(working copy)
@@ -53,7 +53,20 @@
 
 	bool ExecuteLog(const char * format,...);
 	bool PExecuteLog(const char * format,...);
-
+	
+        virtual bool BeginTransaction()                     // nothing do if DB not support transactions
+        {
+            return true;
+        }
+        virtual bool CommitTransaction()                    // nothing do if DB not support transactions
+        {
+            return true;
+        }
+        virtual bool RollbackTransaction()                  // can't rollback without transaction support
+        {
+            return false;
+        } 
+        
     virtual void CheckConnections() = 0;
 
     inline DatabaseType GetType() { return mType; }
@@ -102,7 +115,6 @@
 Database* CreateDatabaseInterface(DatabaseType type);
 void DestroyDatabaseInterface(Database * ptr);
 
-// shitty mangos coders
 extern Database * MainDatabase;
 extern Database * LogonDatabase;
 #define sDatabase (*MainDatabase)
Index: src/shared/Database/impl/MySQLDatabase.cpp
===================================================================
--- src/shared/Database/impl/MySQLDatabase.cpp	(revision 3691)
+++ src/shared/Database/impl/MySQLDatabase.cpp	(working copy)
@@ -321,6 +321,24 @@
     return qResult;
 }
 
+bool MySQLDatabase::BeginTransaction()
+{
+    Execute("BEGIN");
+    return true;
+}
+
+bool MySQLDatabase::CommitTransaction()
+{
+    Execute("COMMIT");
+    return true;
+}
+
+bool MySQLDatabase::RollbackTransaction()
+{
+    Execute("ROLLBACK");
+    return true;
+}
+
 bool MySQLDatabase::Execute(const char* QueryString, ...)
 {
     if(QueryString == NULL) return false;
Index: src/shared/Database/impl/MySQLDatabase.h
===================================================================
--- src/shared/Database/impl/MySQLDatabase.h	(revision 3691)
+++ src/shared/Database/impl/MySQLDatabase.h	(working copy)
@@ -43,6 +43,9 @@
     QueryResult* Query(const char* QueryString, ...);
     bool WaitExecute(const char* QueryString, ...);
     bool Execute(const char* QueryString, ...);
+    bool BeginTransaction();
+    bool CommitTransaction();
+    bool RollbackTransaction();
 
     void CheckConnections();
     bool Active;