diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-08-03 23:00:23 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-08-03 23:00:23 (GMT) |
| commit | 897014a47b41dcf2b9d91549be9b96890d5291c7 (patch) | |
| tree | 91da900adb42122eebdef573c012051ea511e42d /src/sql/drivers/mysql/qsql_mysql.cpp | |
| parent | 37cdd053623bfadded77ba6ad34e0d4c45158cc7 (diff) | |
| parent | 2076f150995e541308b1d8da936b3e12ab68b886 (diff) | |
| download | Qt-897014a47b41dcf2b9d91549be9b96890d5291c7.zip Qt-897014a47b41dcf2b9d91549be9b96890d5291c7.tar.gz Qt-897014a47b41dcf2b9d91549be9b96890d5291c7.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 | 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 bfd65fc..bd6f7b9 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; } |