diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-05-22 07:39:47 (GMT) |
|---|---|---|
| committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-05-22 07:39:47 (GMT) |
| commit | 7ffe42d376b574239480b38b8f6430339b806daa (patch) | |
| tree | 837d538944ca3ab244b733938e23bd4d7694e718 /src/sql/drivers/mysql/qsql_mysql.cpp | |
| parent | 8afd43afdca48cccb18a9435b929c876d1c39a29 (diff) | |
| parent | f9d26f0bebd5bcc32d15c4a627251c44cf78389e (diff) | |
| download | Qt-7ffe42d376b574239480b38b8f6430339b806daa.zip Qt-7ffe42d376b574239480b38b8f6430339b806daa.tar.gz Qt-7ffe42d376b574239480b38b8f6430339b806daa.tar.bz2 | |
Merge branch 'master' 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 | 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); |