From: Xinchen Hui <laruence@gmail.com>
Date: Wed, 2 Mar 2016 06:26:34 +0000 (+0800)
Subject: Merge branch 'PHP-5.6-bug_69757' of https://github.com/wayfair/php-src into PHP-5.6
X-Git-Tag: php-5.6.20RC1~19
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=20add1e530e7235f73acb8af7e0344e97e63053f;p=php

Merge branch 'PHP-5.6-bug_69757' of https://github.com/wayfair/php-src into PHP-5.6

* 'PHP-5.6-bug_69757' of https://github.com/wayfair/php-src:
  limit size of result set so unit test runs reliably
---

20add1e530e7235f73acb8af7e0344e97e63053f