diff options
| author | Martin Smith <msmith@trolltech.com> | 2009-05-20 10:01:47 (GMT) |
|---|---|---|
| committer | Martin Smith <msmith@trolltech.com> | 2009-05-20 10:01:47 (GMT) |
| commit | f692eb8a65524f8ac166c660fbaa87f0dbfd8b79 (patch) | |
| tree | 4fc667e80df43e5ec458eea151da081ed1c78b01 /src/sql/drivers/mysql/qsql_mysql.cpp | |
| parent | 387db114cf09e60b43b13c36c83ef8cf07ee6553 (diff) | |
| parent | 4a8c7e432931b27e7a5440a6d15bde999e962f35 (diff) | |
| download | Qt-f692eb8a65524f8ac166c660fbaa87f0dbfd8b79.zip Qt-f692eb8a65524f8ac166c660fbaa87f0dbfd8b79.tar.gz Qt-f692eb8a65524f8ac166c660fbaa87f0dbfd8b79.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
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); |