From: Nikita Popov <nikita.ppv@gmail.com>
Date: Fri, 4 Dec 2020 16:00:20 +0000 (+0100)
Subject: Merge branch 'PHP-7.4' into PHP-8.0
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9dc42b411433f25d37bb4c03ae1270fef8c0d062;p=php

Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
  Fixed bug #80458
---

9dc42b411433f25d37bb4c03ae1270fef8c0d062
diff --cc NEWS
index 7a36c4197b,dab2198b9b..0a02972f90
--- a/NEWS
+++ b/NEWS
@@@ -34,10 -24,14 +34,14 @@@ PH
    . Fixed bug #80368 (OpenSSL extension fails to build against LibreSSL due to
      lack of OCB support). (Nikita)
  
 -- Phar:
 -  . Fixed bug #73809 (Phar Zip parse crash - mmap fail). (cmb)
 -  . Fixed #75102 (`PharData` says invalid checksum for valid tar). (cmb)
 -
+ - PDO MySQL:
+   . Fixed bug #80458 (PDOStatement::fetchAll() throws for upsert queries).
+     (Kamil Tekiela)
+ 
 +- Phar:
 +  . Fixed bug #73809 (Phar Zip parse crash - mmap fail). (cmb)
 +  . Fixed #75102 (`PharData` says invalid checksum for valid tar). (cmb)
 +
  - Phpdbg:
    . Fixed bug #76813 (Access violation near NULL on source operand). (cmb)