From ae5696ef2b670e0aa547839a691ab8a375515559 Mon Sep 17 00:00:00 2001
From: Shauren <shauren.trinity@gmail.com>
Date: Sat, 13 May 2017 21:02:37 +0200
Subject: [PATCH] Build fix for mysql 5.6 and older

---
 src/server/database/Database/DatabaseWorkerPool.cpp  | 3 +++
 src/server/database/Database/Field.cpp               | 3 +++
 src/server/database/Database/MySQLConnection.cpp     | 3 +++
 src/server/database/Database/MySQLThreading.cpp      | 3 +++
 src/server/database/Database/PreparedStatement.cpp   | 3 +++
 src/server/database/Database/QueryResult.cpp         | 3 +++
 src/server/database/PrecompiledHeaders/databasePCH.h | 3 +++
 7 files changed, 21 insertions(+)

diff --git a/src/server/database/Database/DatabaseWorkerPool.cpp b/src/server/database/Database/DatabaseWorkerPool.cpp
index 2af31c53a4..ce87eb31f8 100644
--- a/src/server/database/Database/DatabaseWorkerPool.cpp
+++ b/src/server/database/Database/DatabaseWorkerPool.cpp
@@ -31,6 +31,9 @@
 #include "QueryResult.h"
 #include "SQLOperation.h"
 #include "Transaction.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 <mysqld_error.h>
 
diff --git a/src/server/database/Database/Field.cpp b/src/server/database/Database/Field.cpp
index 0f3b3de548..33fd4bec51 100644
--- a/src/server/database/Database/Field.cpp
+++ b/src/server/database/Database/Field.cpp
@@ -304,6 +304,9 @@ bool Field::IsNumeric() const
 
 #ifdef TRINITY_DEBUG
 
+#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>
 
 static char const* FieldTypeToString(enum_field_types type)
diff --git a/src/server/database/Database/MySQLConnection.cpp b/src/server/database/Database/MySQLConnection.cpp
index 2598e3214f..c37ec364af 100644
--- a/src/server/database/Database/MySQLConnection.cpp
+++ b/src/server/database/Database/MySQLConnection.cpp
@@ -24,6 +24,9 @@
 #include "Timer.h"
 #include "Transaction.h"
 #include "Util.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 <errmsg.h>
 #include <mysql.h>
 #include <mysqld_error.h>
diff --git a/src/server/database/Database/MySQLThreading.cpp b/src/server/database/Database/MySQLThreading.cpp
index d86f61853e..206a9debe3 100644
--- a/src/server/database/Database/MySQLThreading.cpp
+++ b/src/server/database/Database/MySQLThreading.cpp
@@ -16,6 +16,9 @@
  */
 
 #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>
 
 void MySQL::Library_Init()
diff --git a/src/server/database/Database/PreparedStatement.cpp b/src/server/database/Database/PreparedStatement.cpp
index a756ddf675..44cac79c5e 100644
--- a/src/server/database/Database/PreparedStatement.cpp
+++ b/src/server/database/Database/PreparedStatement.cpp
@@ -20,6 +20,9 @@
 #include "MySQLConnection.h"
 #include "QueryResult.h"
 #include "Log.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 <sstream>
 
diff --git a/src/server/database/Database/QueryResult.cpp b/src/server/database/Database/QueryResult.cpp
index b44768e709..5fa2263ca6 100644
--- a/src/server/database/Database/QueryResult.cpp
+++ b/src/server/database/Database/QueryResult.cpp
@@ -20,6 +20,9 @@
 #include "Errors.h"
 #include "Field.h"
 #include "Log.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>
 
 static uint32 SizeForType(MYSQL_FIELD* field)
diff --git a/src/server/database/PrecompiledHeaders/databasePCH.h b/src/server/database/PrecompiledHeaders/databasePCH.h
index 60f57abf94..39701ca8ca 100644
--- a/src/server/database/PrecompiledHeaders/databasePCH.h
+++ b/src/server/database/PrecompiledHeaders/databasePCH.h
@@ -7,6 +7,9 @@
 #include "QueryResult.h"
 #include "SQLOperation.h"
 #include "Transaction.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 <string>
 #include <vector>