diff options
author | jackpoz <giacomopoz@gmail.com> | 2014-09-10 19:57:02 +0200 |
---|---|---|
committer | jackpoz <giacomopoz@gmail.com> | 2014-09-10 22:39:03 +0200 |
commit | 8bb4f338523810035a3e1031bb2d0e0a4c488254 (patch) | |
tree | 6dff57d0abddefd5adf52a501482b682b04b28ec /src/server/shared/Database/MySQLConnection.cpp | |
parent | 449d7c196a7bfdedbc94edbbfd3ace3a53d9fffe (diff) |
Core/DB: Fix crash on shutdown
Fix race condition crash on shutdown, closing MySQL connections with queries still being executed
Diffstat (limited to 'src/server/shared/Database/MySQLConnection.cpp')
-rw-r--r-- | src/server/shared/Database/MySQLConnection.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/server/shared/Database/MySQLConnection.cpp b/src/server/shared/Database/MySQLConnection.cpp index 4e46ff0e3a1..abdf2a2cc3c 100644 --- a/src/server/shared/Database/MySQLConnection.cpp +++ b/src/server/shared/Database/MySQLConnection.cpp @@ -57,14 +57,14 @@ m_connectionFlags(CONNECTION_ASYNC) MySQLConnection::~MySQLConnection() { + if (m_worker) + delete m_worker; + for (size_t i = 0; i < m_stmts.size(); ++i) delete m_stmts[i]; if (m_Mysql) mysql_close(m_Mysql); - - if (m_worker) - delete m_worker; } void MySQLConnection::Close() |