summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2012-10-10 13:15:16 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2012-10-10 13:15:16 -0400
commitec538d355562d448bb9981d77d1dc6025a6e1f1a (patch)
tree0165b2cc822d01517f9e90fb46499c0c657e94a3
parent17936043c6be46ac339091a6c99b0c383513db2a (diff)
downloadsqlalchemy-ec538d355562d448bb9981d77d1dc6025a6e1f1a.tar.gz
- [feature] Added "read_timeout" flag to MySQLdb
dialect. [ticket:2554]
-rw-r--r--CHANGES3
-rw-r--r--lib/sqlalchemy/connectors/mysqldb.py1
2 files changed, 4 insertions, 0 deletions
diff --git a/CHANGES b/CHANGES
index a89ef55fd..c36cdd788 100644
--- a/CHANGES
+++ b/CHANGES
@@ -828,6 +828,9 @@ are also present in 0.8.
- [feature] Added "raise_on_warnings" flag to OurSQL
dialect. [ticket:2523]
+ - [feature] Added "read_timeout" flag to MySQLdb
+ dialect. [ticket:2554]
+
0.7.9
=====
- orm
diff --git a/lib/sqlalchemy/connectors/mysqldb.py b/lib/sqlalchemy/connectors/mysqldb.py
index 613a8f5b2..4479deafe 100644
--- a/lib/sqlalchemy/connectors/mysqldb.py
+++ b/lib/sqlalchemy/connectors/mysqldb.py
@@ -63,6 +63,7 @@ class MySQLDBConnector(Connector):
util.coerce_kw_type(opts, 'compress', bool)
util.coerce_kw_type(opts, 'connect_timeout', int)
+ util.coerce_kw_type(opts, 'read_timeout', int)
util.coerce_kw_type(opts, 'client_flag', int)
util.coerce_kw_type(opts, 'local_infile', int)
# Note: using either of the below will cause all strings to be returned