diff options
| author | jackpoz <giacomopoz@gmail.com> | 2015-02-03 22:16:41 +0100 |
|---|---|---|
| committer | Nayd <dnpd.dd@gmail.com> | 2015-02-04 19:20:39 +0000 |
| commit | 7c3a2e163ae184a7f50b651f63c54fe7f3dcdaca (patch) | |
| tree | dd9412a1aa804245f448434d9f51d6d9ccdd0897 /src/server/shared/Database/MySQLConnection.h | |
| parent | d2b7268f1d30629e066473fff6c2167eb3b330bc (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.
(cherry picked from commit d4db0c15c7e59f7139619720be3c26a48e6ff259)
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); } |