Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Database Improve commit 39bdd06446

Browse Source 
* found a better way where no cast is needed.
* ref #14430
This commit is contained in:
Naios
2015-03-28 16:03:41 +01:00
parent 9fb96ed3f8
commit 54ee526724
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/server/shared/Database/MySQLConnection.cpp
View File

@@ -137,9 +137,7 @@ uint32 MySQLConnection::Open()
// set connection properties to UTF8 to properly handle locales for different
// server configs - core sends data in UTF8, so MySQL must expect UTF8 too
mysql_set_character_set(m_Mysql, "utf8");
// Prepare statements only at reconnect
return m_reconnecting ? static_cast<uint32>(PrepareStatements()) : 0;
return 0;
}
else
{
@@ -493,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()))