diff options
| author | Aleksandar Sasha Babic <aleksandar.babic@nokia.com> | 2009-05-21 07:31:51 (GMT) |
|---|---|---|
| committer | Aleksandar Sasha Babic <aleksandar.babic@nokia.com> | 2009-05-21 07:31:51 (GMT) |
| commit | 47cbde8e5fbb7f0c4dc197c2ef241f5ba9fe2743 (patch) | |
| tree | e8518206ec161750de9722aee17eb82805cca061 /src/sql/drivers/mysql/qsql_mysql.cpp | |
| parent | 0987e68043e174a2a033b58d065c6069c0cf8a1a (diff) | |
| parent | a064fe66f5256c7ded6f3df87f503aa0fb8e341b (diff) | |
| download | Qt-47cbde8e5fbb7f0c4dc197c2ef241f5ba9fe2743.zip Qt-47cbde8e5fbb7f0c4dc197c2ef241f5ba9fe2743.tar.gz Qt-47cbde8e5fbb7f0c4dc197c2ef241f5ba9fe2743.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.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); |