Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-21 09:44:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '6.x' of https://github.com/TrinityCore/TrinityCore into 6.x

Browse Source
This commit is contained in:
Rat
2015-03-29 17:56:49 +02:00
parent 81df6b2ad2 833d57fa27
commit dcd18eef2a
15 changed files with 100 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/shared/CMakeLists.txt
View File

@@ -87,6 +87,8 @@ include_directories(
${VALGRIND_INCLUDE_DIR}
)
GroupSources(${CMAKE_CURRENT_SOURCE_DIR})
add_library(shared STATIC
${shared_STAT_SRCS}
${shared_STAT_PCH_SRC}

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

@@ -79,7 +79,7 @@ uint32 MySQLConnection::Open()
if (!mysqlInit)
{
TC_LOG_ERROR("sql.sql", "Could not initialize Mysql connection to database `%s`", m_connectionInfo.database.c_str());
return false;
return CR_UNKNOWN_ERROR;
}
int port;
@@ -492,9 +492,17 @@ bool MySQLConnection::_HandleMySQLErrno(uint32 errNo)
uint64 oldThreadId = mysql_thread_id(GetHandle());
mysql_close(GetHandle());
// Don't remove 'this' pointer unless you want to skip loading all prepared statements....
if (this->Open() && this->PrepareStatements())
uint32 const lErrno = Open();
if (!lErrno)
{
// Don't remove 'this' pointer unless you want to skip loading all prepared statements...
if (!this->PrepareStatements())
{
TC_LOG_ERROR("sql.sql", "Could not re-prepare statements!");
Close();
return false;
}
TC_LOG_INFO("sql.sql", "Connection to the MySQL server is active.");
if (oldThreadId != mysql_thread_id(GetHandle()))
TC_LOG_INFO("sql.sql", "Successfully reconnected to %s @%s:%s (%s).",
@@ -505,7 +513,7 @@ bool MySQLConnection::_HandleMySQLErrno(uint32 errNo)
return true;
}
uint32 lErrno = mysql_errno(GetHandle()); // It's possible this attempted reconnect throws 2006 at us. To prevent crazy recursive calls, sleep here.
// It's possible this attempted reconnect throws 2006 at us. To prevent crazy recursive calls, sleep here.
std::this_thread::sleep_for(std::chrono::seconds(3)); // Sleep 3 seconds
return _HandleMySQLErrno(lErrno); // Call self (recursive)
}