diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-05-06 10:34:46 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-05-06 10:34:46 (GMT) |
| commit | a935becb2957604db0a389a084fc68b5a039d9c2 (patch) | |
| tree | c8c9d23628f2e13b86ee775b6f4678512d39bbdb /src/sql/drivers/mysql/qsql_mysql.cpp | |
| parent | 6ee512244b371f63138a645c2f612abc44eb6107 (diff) | |
| parent | a80b082e9307aa819259590fd98ae135450930f1 (diff) | |
| download | Qt-a935becb2957604db0a389a084fc68b5a039d9c2.zip Qt-a935becb2957604db0a389a084fc68b5a039d9c2.tar.gz Qt-a935becb2957604db0a389a084fc68b5a039d9c2.tar.bz2 | |
Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public
Diffstat (limited to 'src/sql/drivers/mysql/qsql_mysql.cpp')
| -rw-r--r-- | src/sql/drivers/mysql/qsql_mysql.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/sql/drivers/mysql/qsql_mysql.cpp b/src/sql/drivers/mysql/qsql_mysql.cpp index a84e840..1f54db7 100644 --- a/src/sql/drivers/mysql/qsql_mysql.cpp +++ b/src/sql/drivers/mysql/qsql_mysql.cpp @@ -224,7 +224,7 @@ static QTextCodec* codec(MYSQL* mysql) static QSqlError qMakeError(const QString& err, QSqlError::ErrorType type, const QMYSQLDriverPrivate* p) { - const char *cerr = mysql_error(p->mysql); + const char *cerr = p->mysql ? mysql_error(p->mysql) : 0; return QSqlError(QLatin1String("QMYSQL: ") + err, p->tc ? toUnicode(p->tc, cerr) : QString::fromLatin1(cerr), type, mysql_errno(p->mysql)); |