diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2021-10-14 08:43:43 -0700 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2021-10-19 07:55:53 -0700 |
| commit | 11f5c07c1b312d70197bbada3842d72c1c97c5ff (patch) | |
| tree | 59756a63fef52503130a0e7606d50ed469799085 /src/plugins/sqldrivers | |
| parent | aad24f603387859531f1b61f94962c862397aba9 (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
Pick-to: 6.2 6.2.1
Change-Id: Iea05060bc2c046928536fffd16adf0177aadb082
Reviewed-by: Liang Qi <liang.qi@qt.io>
Diffstat (limited to 'src/plugins/sqldrivers')
| -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 96bba79da1..899689af11 100644 --- a/src/plugins/sqldrivers/mysql/qsql_mysql.cpp +++ b/src/plugins/sqldrivers/mysql/qsql_mysql.cpp @@ -1305,10 +1305,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; } |