From: Dmitry Stogov <dmitry@zend.com>
Date: Wed, 7 Oct 2015 09:22:17 +0000 (+0300)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha1~1015^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dbb0ed0c1bf5435e620db5f99ce66c918b9f8bad;p=php

Merge branch 'PHP-7.0'

* PHP-7.0:
  Fixed test running on MarinaDB.
---

dbb0ed0c1bf5435e620db5f99ce66c918b9f8bad