Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-15 23:20:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Common: Include cleanup

Browse Source
This commit is contained in:
Shauren
2017-05-11 22:29:51 +02:00
parent 8abc56c540
commit 3a418a0bbc
145 changed files with 1194 additions and 989 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/server/database/Updater/DBUpdater.cpp
View File

@@ -41,18 +41,12 @@ bool DBUpdaterUtil::CheckExecutable()
boost::filesystem::path exe(GetCorrectedMySQLExecutable());
if (!exists(exe))
{
exe.clear();
if (auto path = Trinity::SearchExecutableInPath("mysql"))
exe = Trinity::SearchExecutableInPath("mysql");
if (!exe.empty() && exists(exe))
{
exe = std::move(*path);
if (!exe.empty() && exists(exe))
{
// Correct the path to the cli
corrected_path() = absolute(exe).generic_string();
return true;
}
// Correct the path to the cli
corrected_path() = absolute(exe).generic_string();
return true;
}
TC_LOG_FATAL("sql.updates", "Didn't find any executable MySQL binary at \'%s\' or in path, correct the path in the *.conf (\"MySQLExecutable\").",
@@ -347,7 +341,7 @@ bool DBUpdater<T>::Populate(DatabaseWorkerPool<T>& pool)
template<class T>
QueryResult DBUpdater<T>::Retrieve(DatabaseWorkerPool<T>& pool, std::string const& query)
{
return pool.PQuery(query.c_str());
return pool.Query(query.c_str());
}
template<class T>