diff options
| author | Rat <gmstreetrat@gmail.com> | 2015-03-29 11:25:48 +0200 |
|---|---|---|
| committer | Rat <gmstreetrat@gmail.com> | 2015-03-29 11:25:48 +0200 |
| commit | 3660c3a37f7f5a61e14f28c09f94f57fe6315788 (patch) | |
| tree | 61e92a0de035697d350d1545c1bdafd569d91778 /src/server/shared/Database/MySQLConnection.cpp | |
| parent | eebc468e628acc801a6426e03815150c8cfd9172 (diff) | |
| parent | c26dbb786a91b0454a8648039b63d3dc9ddd1c42 (diff) | |
Merge branch '6.x' of https://github.com/TrinityCore/TrinityCore into 6.x
Conflicts:
src/server/game/Handlers/MiscHandler.cpp
src/server/game/Server/Protocol/Opcodes.cpp
Diffstat (limited to 'src/server/shared/Database/MySQLConnection.cpp')
| -rw-r--r-- | src/server/shared/Database/MySQLConnection.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/server/shared/Database/MySQLConnection.cpp b/src/server/shared/Database/MySQLConnection.cpp index 1fa3f01a5e1..5a98757abb5 100644 --- a/src/server/shared/Database/MySQLConnection.cpp +++ b/src/server/shared/Database/MySQLConnection.cpp @@ -491,7 +491,9 @@ bool MySQLConnection::_HandleMySQLErrno(uint32 errNo) m_reconnecting = true; uint64 oldThreadId = mysql_thread_id(GetHandle()); mysql_close(GetHandle()); - if (this->Open()) // Don't remove 'this' pointer unless you want to skip loading all prepared statements.... + + // Don't remove 'this' pointer unless you want to skip loading all prepared statements.... + if (this->Open() && this->PrepareStatements()) { TC_LOG_INFO("sql.sql", "Connection to the MySQL server is active."); if (oldThreadId != mysql_thread_id(GetHandle())) |