From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Wed, 10 Oct 2012 17:15:16 +0000 (-0400)
Subject: - [feature] Added "read_timeout" flag to MySQLdb
X-Git-Tag: rel_0_7_10~30
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=44297b474f6569f8f21bb64cb15cd5ea2032debc;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- [feature] Added "read_timeout" flag to MySQLdb
    dialect.  [ticket:2554]
---

diff --git a/CHANGES b/CHANGES
index f8031c3320..9b1bb4e6de 100644
--- 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 b5a9f05a8d..be1f35300e 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