diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/database/Database/MySQLConnection.cpp | 4 | ||||
| -rw-r--r-- | src/server/database/Updater/DBUpdater.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/server/database/Database/MySQLConnection.cpp b/src/server/database/Database/MySQLConnection.cpp index 994c532b4c5..f36f9d93fd3 100644 --- a/src/server/database/Database/MySQLConnection.cpp +++ b/src/server/database/Database/MySQLConnection.cpp @@ -99,7 +99,7 @@ uint32 MySQLConnection::Open() char const* unix_socket; //unsigned int timeout = 10; - mysql_options(mysqlInit, MYSQL_SET_CHARSET_NAME, "utf8"); + mysql_options(mysqlInit, MYSQL_SET_CHARSET_NAME, "utf8mb4"); //mysql_options(mysqlInit, MYSQL_OPT_READ_TIMEOUT, (char const*)&timeout); #ifdef _WIN32 if (m_connectionInfo.host == ".") // named pipe use option (Windows) @@ -168,7 +168,7 @@ uint32 MySQLConnection::Open() // set connection properties to UTF8 to properly handle locales for different // server configs - core sends data in UTF8, so MySQL must expect UTF8 too - mysql_set_character_set(m_Mysql, "utf8"); + mysql_set_character_set(m_Mysql, "utf8mb4"); return 0; } else diff --git a/src/server/database/Updater/DBUpdater.cpp b/src/server/database/Updater/DBUpdater.cpp index c61aa506f7b..fd5510289cd 100644 --- a/src/server/database/Updater/DBUpdater.cpp +++ b/src/server/database/Updater/DBUpdater.cpp @@ -365,7 +365,7 @@ void DBUpdater<T>::ApplyFile(DatabaseWorkerPool<T>& pool, std::string const& hos #endif // Set the default charset to utf8 - args.emplace_back("--default-character-set=utf8"); + args.emplace_back("--default-character-set=utf8mb4"); // Set max allowed packet to 1 GB args.emplace_back("--max-allowed-packet=1GB"); |