From: Nikita Popov <nikita.ppv@gmail.com>
Date: Thu, 3 Dec 2020 09:45:27 +0000 (+0100)
Subject: Merge branch 'PHP-7.4' into PHP-8.0
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=98cccd304a7d169fa0d058eb6fb947e16ff6eec9;p=php

Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
  fix mysqli_stmt_get_result_metadata_fetch_field test for mariadb
---

98cccd304a7d169fa0d058eb6fb947e16ff6eec9