- [feature] Added "read_timeout" flag to MySQLdb

    dialect.  [ticket:2554]

diff --git a/CHANGES b/CHANGES
index a89ef55fdd042f9ac048d6f9d22188fba6454dbe..c36cdd7885370238204e82e471b406be68be465e 100644 (file)
--- 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 613a8f5b27313ffe37306cc170f312579c0559f8..4479deafec6df1784b4266b5a9af688f6fe486ee 100644 (file)
--- 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