diff options
| author | Andy Shaw <andy.shaw@digia.com> | 2015-03-13 12:26:22 +0100 |
|---|---|---|
| committer | Andy Shaw <andy.shaw@digia.com> | 2015-04-27 11:39:29 +0000 |
| commit | 4dd896785b0b1a3bc6c0fd5380f9b7753fbee9e6 (patch) | |
| tree | 4b72867d0b63b0c63eed8f201bc8a9c64887dc46 /src/sql/kernel/qsqldatabase.cpp | |
| parent | 4bafef9890a1dc42a5e95a348ace9bdd70b1fc61 (diff) | |
MySQL: Add support for the timeout options via the connectionOptions
Task-number: QTBUG-321
Change-Id: I0bbc1ae713fb0278a9973f8e87f28f1b3f1c49ce
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Diffstat (limited to 'src/sql/kernel/qsqldatabase.cpp')
| -rw-r--r-- | src/sql/kernel/qsqldatabase.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/sql/kernel/qsqldatabase.cpp b/src/sql/kernel/qsqldatabase.cpp index 7bffb05a08..240e19bf20 100644 --- a/src/sql/kernel/qsqldatabase.cpp +++ b/src/sql/kernel/qsqldatabase.cpp @@ -1224,6 +1224,9 @@ QSqlRecord QSqlDatabase::record(const QString& tablename) const \li CLIENT_INTERACTIVE \li UNIX_SOCKET \li MYSQL_OPT_RECONNECT + \li MYSQL_OPT_CONNECT_TIMEOUT + \li MYSQL_OPT_READ_TIMEOUT + \li MYSQL_OPT_WRITE_TIMEOUT \endlist \li |