- [feature] Added "read_timeout" flag to MySQLdb

    dialect.  [ticket:2554]

diff --git a/CHANGES b/CHANGES
index f8031c33200d91ee5f2a66d81cc3d02b495bdacd..9b1bb4e6dec79f764773306735fcb273d5771498 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -19,6 +19,9 @@ CHANGES
   - [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 b5a9f05a8d2b8bd48a9202eccbcbf0120f07fc7b..be1f35300e75d98b225d297a6ada8303e55b110c 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