Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
  Fixed bug #63185

diff --cc NEWS
index 66c15f423101dea9c1ee41f51b1695a5965c2f31,b242d304154fbc437899ffa2d17dfc2168648066..923fe715efc7590a3209fb0ea2bcd1a69892f97e
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -38,11 -27,13 +38,13 @@@ PH
  - PDO MySQL:
    . Fixed bug #80458 (PDOStatement::fetchAll() throws for upsert queries).
      (Kamil Tekiela)
+   . Fixed bug #63185 (nextRowset() ignores MySQL errors with native prepared
+     statements). (Nikita)
  
 +- 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)
  

diff --cc ext/pdo_mysql/mysql_statement.c
Simple merge