diff options
| author | jackpoz <giacomopoz@gmail.com> | 2015-02-03 22:16:41 +0100 |
|---|---|---|
| committer | jackpoz <giacomopoz@gmail.com> | 2015-02-04 19:42:39 +0100 |
| commit | d4db0c15c7e59f7139619720be3c26a48e6ff259 (patch) | |
| tree | 891891bacff604a770d332778428a52b463cd671 /src/server/shared/Database/MySQLConnection.h | |
| parent | 8b50c142cbf72a51141e7b25c2e0111af6315ce2 (diff) | |
Shared/Database: Fix transactions not being recommitted on dead-lock error
Fix transactions not being recommitted on dead-lock error (error code 1213) because of calling http://dev.mysql.com/doc/refman/5.0/en/mysql-errno.html after sending the ROLLBACK command. This way the returned error code was related to the ROLLBACK command, not the failed transaction.
Diffstat (limited to 'src/server/shared/Database/MySQLConnection.h')
| -rw-r--r-- | src/server/shared/Database/MySQLConnection.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/shared/Database/MySQLConnection.h b/src/server/shared/Database/MySQLConnection.h index 33f17d02228..d486f5b4679 100644 --- a/src/server/shared/Database/MySQLConnection.h +++ b/src/server/shared/Database/MySQLConnection.h @@ -86,7 +86,7 @@ class MySQLConnection void BeginTransaction(); void RollbackTransaction(); void CommitTransaction(); - bool ExecuteTransaction(SQLTransaction& transaction); + int ExecuteTransaction(SQLTransaction& transaction); operator bool () const { return m_Mysql != NULL; } void Ping() { mysql_ping(m_Mysql); } |