diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2021-10-14 08:43:43 -0700 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-10-20 10:10:43 +0000 |
| commit | 69080ce332cef9a405c38d298319de00c9e2dfd8 (patch) | |
| tree | 77a78ad7eaeb4229958527ca89539aa0b03c8d1b | |
| parent | a5dfbb04a7404eab223151dda160597a7698c704 (diff) | |
MySQL: fix the check for the return value of mysql_set_character_set()
It returns zero on success and non-zero on failure.
Fixes: QTBUG-97054
Change-Id: Iea05060bc2c046928536fffd16adf0177aadb082
Reviewed-by: Liang Qi <liang.qi@qt.io>
(cherry picked from commit 11f5c07c1b312d70197bbada3842d72c1c97c5ff)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/plugins/sqldrivers/mysql/qsql_mysql.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/sqldrivers/mysql/qsql_mysql.cpp b/src/plugins/sqldrivers/mysql/qsql_mysql.cpp index 237495ae64..75ba98d209 100644 --- a/src/plugins/sqldrivers/mysql/qsql_mysql.cpp +++ b/src/plugins/sqldrivers/mysql/qsql_mysql.cpp @@ -1278,10 +1278,10 @@ bool QMYSQLDriver::open(const QString& db, optionFlags); // now ask the server to match the charset we selected - if (!cs || mysql_set_character_set(d->mysql, cs->csname)) { + if (!cs || mysql_set_character_set(d->mysql, cs->csname) != 0) { bool ok = false; for (const char *p : wanted_charsets) { - if (mysql_set_character_set(d->mysql, p)) { + if (mysql_set_character_set(d->mysql, p) == 0) { ok = true; break; } |