From 5f06c476f6b0c6542afdb5e64c1dcfbbcf39dc39 Mon Sep 17 00:00:00 2001
From: Shauren <shauren.trinity@gmail.com>
Date: Fri, 1 Nov 2019 16:21:14 +0100
Subject: Core/DBLayer: Support using mysql 8

(cherry picked from commit c3a9d56b56b665133707f587ecb1bd1c272f6911)
---
 src/server/database/Database/MySQLThreading.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'src/server/database/Database/MySQLThreading.cpp')

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;
+}
-- 
cgit v1.2.3