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

Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
  Fix mysqli_expire_password test for mariadb
---

1a1eeee716a327cedb7789dee94abcec4a197947