Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-24 02:46:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/DBLayer: Support using mysql 8

Browse Source
This commit is contained in:
Shauren
2019-11-01 16:21:14 +01:00
parent 2072258ef4
commit c3a9d56b56
23 changed files with 509 additions and 375 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/server/database/Database/Field.cpp
View File

@@ -299,10 +299,7 @@ void Field::LogWrongType(char* getter) const
getter, meta.Type, meta.TableAlias, meta.Alias, meta.TableName, meta.Name, meta.Index);
}
#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)
{
@@ -338,7 +335,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;