From 65aca9a223ec8853cc17bf348d4131a9f3ad233f Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Fri, 13 Aug 2021 17:51:03 -0700 Subject: [PATCH] MySQL: remove left-over charset-setting code Complements commit 472520afb9081856a2556c7df221c084a42a2d42. We were doing it twice. Change-Id: I4a40ccbd3321467a8429fffd169b05fa5e22f204 Reviewed-by: Andy Shaw --- src/plugins/sqldrivers/mysql/qsql_mysql.cpp | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/plugins/sqldrivers/mysql/qsql_mysql.cpp b/src/plugins/sqldrivers/mysql/qsql_mysql.cpp index 250b39c930d..2c0ccc8399a 100644 --- a/src/plugins/sqldrivers/mysql/qsql_mysql.cpp +++ b/src/plugins/sqldrivers/mysql/qsql_mysql.cpp @@ -1311,13 +1311,6 @@ bool QMYSQLDriver::open(const QString& db, return false; } - // force the communication to be utf8mb4 (only utf8mb4 supports 4-byte characters) - if (mysql_set_character_set(d->mysql, "utf8mb4")) { - // this failed, try forcing it to utf (BMP only) - if (mysql_set_character_set(d->mysql, "utf8")) - qWarning() << "MySQL: Unable to set the client character set to utf8."; - } - d->preparedQuerysEnabled = checkPreparedQueries(d->mysql); #if QT_CONFIG(thread)