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/Field.cpp | |
| parent | ed2c2941a74ec720c5e4db3cb33367235e6c3655 (diff) | |
Core/DBLayer: Support using mysql 8
(cherry picked from commit c3a9d56b56b665133707f587ecb1bd1c272f6911)
Diffstat (limited to 'src/server/database/Database/Field.cpp')
| -rw-r--r-- | src/server/database/Database/Field.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
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 <winsock2.h> -#endif -#include <mysql.h> +#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; |