From: Dmitry Stogov <dmitry@zend.com>
Date: Mon, 16 Oct 2017 16:02:22 +0000 (+0300)
Subject: Merge branch 'PHP-7.1' into PHP-7.2
X-Git-Tag: php-7.2.0RC5~48
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5d6912d185f8bdf6b25f95255cc653f0048da4f0;p=php

Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Prevent crash on ext/pdo_mysql/tests/bug_39858.phpt when built with libmysql
---

5d6912d185f8bdf6b25f95255cc653f0048da4f0