From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Fri, 2 Aug 2019 14:43:19 +0000 (+0200)
Subject: Merge branch 'PHP-7.2' into PHP-7.3
X-Git-Tag: php-7.4.0beta2~6^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=81efd489db387a6ab3c9bcafdfd65e304cf2ab08;p=php

Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fix #78179: MariaDB server version incorrectly detected
---

81efd489db387a6ab3c9bcafdfd65e304cf2ab08
diff --cc NEWS
index 8d7f205b7a,31b67125f6..41267187e0
--- a/NEWS
+++ b/NEWS
@@@ -25,7 -21,7 +25,8 @@@ PH
    . Updated to LiteSpeed SAPI V7.5 (Fixed clean shutdown). (George Wang)
  
  - MySQLnd:
+   . Fixed bug #78179 (MariaDB server version incorrectly detected). (cmb)
 +  . Fixed bug #78213 (Empty row pocket). (cmb)
  
  - Standard:
    . Fixed bug #69100 (Bus error from stream_copy_to_stream (file -> SSL stream)