diff options
| author | axis <qt-info@nokia.com> | 2009-05-06 06:55:50 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-05-06 06:55:50 (GMT) |
| commit | b246f8a8beab858468777f433f49faf62edcb07e (patch) | |
| tree | 120844101aca654bf2f69fef5ea2647bf0bee13a /src/sql/drivers/mysql/qsql_mysql.cpp | |
| parent | 5791fde8526afc49cdbeee080ead9e8a305e3cd5 (diff) | |
| parent | a1d2c3c589a03cc427dcc22d109003576add9500 (diff) | |
| download | Qt-b246f8a8beab858468777f433f49faf62edcb07e.zip Qt-b246f8a8beab858468777f433f49faf62edcb07e.tar.gz Qt-b246f8a8beab858468777f433f49faf62edcb07e.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt
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)); |