diff options
author | David Boddie <dboddie@trolltech.com> | 2009-05-20 12:30:38 (GMT) |
---|---|---|
committer | David Boddie <dboddie@trolltech.com> | 2009-05-20 12:30:38 (GMT) |
commit | e28412e4c2389c1765441cec02baed58a63dd29c (patch) | |
tree | 458d92f3cce5e7532d0569a251f5c3f7ca2f95a8 /src/sql/drivers/mysql/qsql_mysql.cpp | |
parent | fc6e0155cc3fa9beb3b48704a1effe87a74c2779 (diff) | |
parent | 095fe67c4a669f038ea7c14613efe5cb9453fa74 (diff) | |
download | Qt-e28412e4c2389c1765441cec02baed58a63dd29c.zip Qt-e28412e4c2389c1765441cec02baed58a63dd29c.tar.gz Qt-e28412e4c2389c1765441cec02baed58a63dd29c.tar.bz2 |
Merge branch '4.5' of ../qt-45-documentation
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); |