From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sun, 14 Jun 2015 20:45:01 +0000 (-0400)
Subject: Merge branch 'pr182'
X-Git-Tag: rel_1_0_6~21
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7f7ae03b0dfa7fc29155a81a84a2eae34655c551;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

Merge branch 'pr182'
---

7f7ae03b0dfa7fc29155a81a84a2eae34655c551
diff --cc doc/build/changelog/changelog_10.rst
index e37fc46c79,155302388a..f4c1d215d2
--- a/doc/build/changelog/changelog_10.rst
+++ b/doc/build/changelog/changelog_10.rst
@@@ -18,16 -18,17 +18,27 @@@
  .. changelog::
      :version: 1.0.6
  
+     .. change::
+         :tags: feature, postgresql
+         :pullreq: github:182
+ 
+         Added new execution option ``max_row_buffer`` which is interpreted
+         by the psycopg2 dialect when the ``stream_results`` option is
+         used, which sets a limit on the size of the row buffer that may be
+         allocated.  This value is also provided based on the integer
+         value sent to :meth:`.Query.yield_per`.  Pull request courtesy
+         mcclurem.
+ 
 +    .. change::
 +        :tags: bug, orm
 +        :tickets: 3451
 +        :pullreq: github:181
 +
 +        Fixed bug in new :meth:`.Session.bulk_update_mappings` feature where
 +        the primary key columns used in the WHERE clause to locate the row
 +        would also be included in the SET clause, setting their value to
 +        themselves unnecessarily.  Pull request courtesy Patrick Hayes.
 +
      .. change::
          :tags: bug, orm
          :tickets: 3448