diff options
| author | Janne Anttila <janne.anttila@digia.com> | 2009-05-22 07:11:44 (GMT) |
|---|---|---|
| committer | Janne Anttila <janne.anttila@digia.com> | 2009-05-22 07:11:44 (GMT) |
| commit | fb8e52465c3f6f9ce4535dfaaffe5c5237b8d88a (patch) | |
| tree | 80f1f44df2da5dcf805752dd984bfe40a2e4a5a5 /src/sql/drivers/mysql/qsql_mysql.cpp | |
| parent | d98d592503ea4da14b99eca54ef0c62c62bc3172 (diff) | |
| parent | 728c09141fa578a754e4bf9b6859f242ff519433 (diff) | |
| download | Qt-fb8e52465c3f6f9ce4535dfaaffe5c5237b8d88a.zip Qt-fb8e52465c3f6f9ce4535dfaaffe5c5237b8d88a.tar.gz Qt-fb8e52465c3f6f9ce4535dfaaffe5c5237b8d88a.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 | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/sql/drivers/mysql/qsql_mysql.cpp b/src/sql/drivers/mysql/qsql_mysql.cpp index fbefa0c..51fc306 100644 --- a/src/sql/drivers/mysql/qsql_mysql.cpp +++ b/src/sql/drivers/mysql/qsql_mysql.cpp @@ -1279,6 +1279,11 @@ bool QMYSQLDriver::open(const QString& db, d->preparedQuerysEnabled = false; #endif +#ifndef QT_NO_THREAD + mysql_thread_init(); +#endif + + setOpen(true); setOpenError(false); return true; @@ -1287,6 +1292,9 @@ bool QMYSQLDriver::open(const QString& db, void QMYSQLDriver::close() { if (isOpen()) { +#ifndef QT_NO_THREAD + mysql_thread_end(); +#endif mysql_close(d->mysql); d->mysql = NULL; setOpen(false); |