diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-08-03 13:33:34 +0200 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-08-03 13:33:34 +0200 |
| commit | 5e05bafa229b645bf30a90975bfc57e458e081e5 (patch) | |
| tree | 54606401f955891574cbcc589ae2558cb2a5b748 /src/sql | |
| parent | 128717b171f01c82e5f0fb83f5923d4f7b9cfc10 (diff) | |
| parent | 463df7e4a6dc7c11716e27ca5de9ebeb61940990 (diff) | |
Merge branch '4.5'
Conflicts:
src/corelib/tools/qsharedpointer.cpp
src/corelib/tools/qsharedpointer_impl.h
src/gui/dialogs/qcolordialog.cpp
src/gui/painting/qwindowsurface_raster.cpp
src/network/access/qnetworkaccessmanager.cpp
tests/auto/qsharedpointer/externaltests.cpp
Diffstat (limited to 'src/sql')
| -rw-r--r-- | src/sql/drivers/mysql/qsql_mysql.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/sql/drivers/mysql/qsql_mysql.cpp b/src/sql/drivers/mysql/qsql_mysql.cpp index bfd65fcfe7..bd6f7b94bc 100644 --- a/src/sql/drivers/mysql/qsql_mysql.cpp +++ b/src/sql/drivers/mysql/qsql_mysql.cpp @@ -1338,8 +1338,8 @@ QSqlIndex QMYSQLDriver::primaryIndex(const QString& tablename) const if (!isOpen()) return idx; - prepQ = d->preparedQuerys; - d->preparedQuerys = false; + prepQ = d->preparedQuerysEnabled; + d->preparedQuerysEnabled = false; QSqlQuery i(createResult()); QString stmt(QLatin1String("show index from %1;")); @@ -1353,7 +1353,7 @@ QSqlIndex QMYSQLDriver::primaryIndex(const QString& tablename) const } } - d->preparedQuerys = prepQ; + d->preparedQuerysEnabled = prepQ; return idx; } |