diff options
| author | Shauren <shauren.trinity@gmail.com> | 2019-11-01 16:21:14 +0100 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2019-11-09 13:49:27 +0100 |
| commit | 5f06c476f6b0c6542afdb5e64c1dcfbbcf39dc39 (patch) | |
| tree | 7d66be6729bf4615001e72f3c7fc78faff70308d /src/server/database/Database/MySQLThreading.cpp | |
| parent | ed2c2941a74ec720c5e4db3cb33367235e6c3655 (diff) | |
Core/DBLayer: Support using mysql 8
(cherry picked from commit c3a9d56b56b665133707f587ecb1bd1c272f6911)
Diffstat (limited to 'src/server/database/Database/MySQLThreading.cpp')
| -rw-r--r-- | src/server/database/Database/MySQLThreading.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/server/database/Database/MySQLThreading.cpp b/src/server/database/Database/MySQLThreading.cpp index 1f0a47cdcf5..84f28289411 100644 --- a/src/server/database/Database/MySQLThreading.cpp +++ b/src/server/database/Database/MySQLThreading.cpp @@ -16,10 +16,7 @@ */ #include "MySQLThreading.h" -#ifdef _WIN32 // hack for broken mysql.h not including the correct winsock header for SOCKET definition, fixed in 5.7 -#include <winsock2.h> -#endif -#include <mysql.h> +#include "MySQLWorkaround.h" void MySQL::Library_Init() { @@ -30,3 +27,8 @@ void MySQL::Library_End() { mysql_library_end(); } + +char const* TC_DATABASE_API MySQL::GetLibraryVersion() +{ + return MYSQL_SERVER_VERSION; +} |