From 5f06c476f6b0c6542afdb5e64c1dcfbbcf39dc39 Mon Sep 17 00:00:00 2001 From: Shauren 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/Field.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'src/server/database/Database/Field.cpp') diff --git a/src/server/database/Database/Field.cpp b/src/server/database/Database/Field.cpp index 29dc4c08c66..8a641af47ad 100644 --- a/src/server/database/Database/Field.cpp +++ b/src/server/database/Database/Field.cpp @@ -304,10 +304,7 @@ bool Field::IsNumeric() const #ifdef TRINITY_STRICT_DATABASE_TYPE_CHECKS -#ifdef _WIN32 // hack for broken mysql.h not including the correct winsock header for SOCKET definition, fixed in 5.7 -#include -#endif -#include +#include "MySQLHacks.h" static char const* FieldTypeToString(enum_field_types type) { @@ -343,7 +340,7 @@ static char const* FieldTypeToString(enum_field_types type) } } -void Field::SetMetadata(MYSQL_FIELD* field, uint32 fieldIndex) +void Field::SetMetadata(MySQLField* field, uint32 fieldIndex) { meta.TableName = field->org_table; meta.TableAlias = field->table; -- cgit v1.2.3