diff options
| author | Rhys Weatherley <rhys.weatherley@nokia.com> | 2009-09-22 02:36:02 (GMT) |
|---|---|---|
| committer | Rhys Weatherley <rhys.weatherley@nokia.com> | 2009-09-22 02:36:02 (GMT) |
| commit | 07a7b69cd5662674ec6ac0c7ba0f874baf854b4c (patch) | |
| tree | d6d100d6b6db37902b4b91c1d109211ae2ef8144 /src/sql/kernel/qsqldatabase.cpp | |
| parent | 8416ae1af3f13ad865b25a87e3e94e298b3a0ca2 (diff) | |
| parent | 21a71222c30214635cb369bedad43bc1e72f05be (diff) | |
| download | Qt-07a7b69cd5662674ec6ac0c7ba0f874baf854b4c.zip Qt-07a7b69cd5662674ec6ac0c7ba0f874baf854b4c.tar.gz Qt-07a7b69cd5662674ec6ac0c7ba0f874baf854b4c.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/sql/kernel/qsqldatabase.cpp')
| -rw-r--r-- | src/sql/kernel/qsqldatabase.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/sql/kernel/qsqldatabase.cpp b/src/sql/kernel/qsqldatabase.cpp index 18a04a3..821760f 100644 --- a/src/sql/kernel/qsqldatabase.cpp +++ b/src/sql/kernel/qsqldatabase.cpp @@ -1228,6 +1228,7 @@ QSqlRecord QSqlDatabase::record(const QString& tablename) const \i CLIENT_NO_SCHEMA \i CLIENT_INTERACTIVE \i UNIX_SOCKET + \i MYSQL_OPT_RECONNECT \endlist \i |