aboutsummaryrefslogtreecommitdiff
path: root/src/server/database/Database
diff options
context:
space:
mode:
authorGiacomo Pozzoni <giacomopoz@gmail.com>2020-03-05 20:16:49 +0100
committerShauren <shauren.trinity@gmail.com>2021-12-22 21:45:46 +0100
commit1529fe10644858023ae953b0d6e2090b78dab5da (patch)
tree81a242577cad02267a506b519cf944354fa53564 /src/server/database/Database
parent05100dc90e6725e50011b2825574868043e777d6 (diff)
Core/Database: Fix build with Maria DB on some distros (#24248)
(cherry picked from commit 0752584856b0d9c2a1a5b179cf90d3bc765fa2c1)
Diffstat (limited to 'src/server/database/Database')
-rw-r--r--src/server/database/Database/DatabaseWorkerPool.cpp4
-rw-r--r--src/server/database/Database/MySQLThreading.cpp4
-rw-r--r--src/server/database/Database/MySQLThreading.h2
3 files changed, 5 insertions, 5 deletions
diff --git a/src/server/database/Database/DatabaseWorkerPool.cpp b/src/server/database/Database/DatabaseWorkerPool.cpp
index 574306c86f2..21f3ff423b3 100644
--- a/src/server/database/Database/DatabaseWorkerPool.cpp
+++ b/src/server/database/Database/DatabaseWorkerPool.cpp
@@ -55,8 +55,8 @@ DatabaseWorkerPool<T>::DatabaseWorkerPool()
{
WPFatal(mysql_thread_safe(), "Used MySQL library isn't thread-safe.");
WPFatal(mysql_get_client_version() >= MIN_MYSQL_CLIENT_VERSION, "TrinityCore does not support MySQL versions below 5.1");
- WPFatal(mysql_get_client_version() == MYSQL_VERSION_ID, "Used MySQL library version (%s) does not match the version used to compile TrinityCore (%s). Search on forum for TCE00011.",
- mysql_get_client_info(), MYSQL_SERVER_VERSION);
+ WPFatal(mysql_get_client_version() == MYSQL_VERSION_ID, "Used MySQL library version (%s id %lu) does not match the version id used to compile TrinityCore (id %u). Search on forum for TCE00011.",
+ mysql_get_client_info(), mysql_get_client_version(), MYSQL_VERSION_ID);
}
template <class T>
diff --git a/src/server/database/Database/MySQLThreading.cpp b/src/server/database/Database/MySQLThreading.cpp
index d373393f284..e3f396d543c 100644
--- a/src/server/database/Database/MySQLThreading.cpp
+++ b/src/server/database/Database/MySQLThreading.cpp
@@ -28,7 +28,7 @@ void MySQL::Library_End()
mysql_library_end();
}
-char const* MySQL::GetLibraryVersion()
+uint32 MySQL::GetLibraryVersion()
{
- return MYSQL_SERVER_VERSION;
+ return MYSQL_VERSION_ID;
}
diff --git a/src/server/database/Database/MySQLThreading.h b/src/server/database/Database/MySQLThreading.h
index a654ef43eb3..6e75bdee939 100644
--- a/src/server/database/Database/MySQLThreading.h
+++ b/src/server/database/Database/MySQLThreading.h
@@ -24,7 +24,7 @@ namespace MySQL
{
TC_DATABASE_API void Library_Init();
TC_DATABASE_API void Library_End();
- TC_DATABASE_API char const* GetLibraryVersion();
+ TC_DATABASE_API uint32 GetLibraryVersion();
};
#endif