Build fix for mysql 5.6 and older

This commit is contained in:
Shauren
2017-05-13 21:02:37 +02:00
parent 2e8b4dc034
commit ae5696ef2b
7 changed files with 21 additions and 0 deletions

View File

@@ -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>

View File

@@ -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)

View File

@@ -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>

View File

@@ -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()

View File

@@ -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>

View File

@@ -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)

View File

@@ -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>