whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MySQL: remove left-over charset-setting code 

Complements commit 472520afb9. We were
doing it twice.

Change-Id: I4a40ccbd3321467a8429fffd169b05fa5e22f204
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
bb10
Thiago Macieira 2021-08-13 17:51:03 -07:00
parent 4ddbfb68f8
commit 65aca9a223
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/sqldrivers/mysql/qsql_mysql.cpp
View File

@ -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)