AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix wrong codec with MySQL plugin in newer versions

Browse Source 
Since MySQL now properly supports UTF-8 through utf8mb4 option, it
caused regression on systems which did not use UTF-8 encoding by default
which caused queries to fail as they were converted into system codec.
To fix this, simply use UTF-8 encoding for queries when MySQL supports
it.

Task-number: QTBUG-59176
Change-Id: I21cc9102b15df15a31bc7c74469321c44a257946
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
This commit is contained in:
Joni Poikelin 2017-02-27 12:59:27 +02:00
parent 740b5c1fea
commit e7f019011a
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1421,13 +1421,17 @@ bool QMYSQLDriver::open(const QString& db,
if (mysql_get_client_version() >= 50503 && mysql_get_server_version(d->mysql) >= 50503) { if (mysql_get_client_version() >= 50503 && mysql_get_server_version(d->mysql) >= 50503) {
// force the communication to be utf8mb4 (only utf8mb4 supports 4-byte characters) // force the communication to be utf8mb4 (only utf8mb4 supports 4-byte characters)
mysql_set_character_set(d->mysql, "utf8mb4"); mysql_set_character_set(d->mysql, "utf8mb4");
} else { #ifndef QT_NO_TEXTCODEC
d->tc = QTextCodec::codecForName("UTF-8");
#endif
} else
{
// force the communication to be utf8 // force the communication to be utf8
mysql_set_character_set(d->mysql, "utf8"); mysql_set_character_set(d->mysql, "utf8");
}
#endif
#ifndef QT_NO_TEXTCODEC #ifndef QT_NO_TEXTCODEC
d->tc = codec(d->mysql); d->tc = codec(d->mysql);
#endif
}
#endif #endif
#if MYSQL_VERSION_ID >= 40108 #if MYSQL_VERSION_ID >= 40108