]> granicus.if.org Git - php/commit
Merge branch 'PHP-7.4' into PHP-8.0
authorNikita Popov <nikita.ppv@gmail.com>
Wed, 28 Oct 2020 10:35:38 +0000 (11:35 +0100)
committerNikita Popov <nikita.ppv@gmail.com>
Wed, 28 Oct 2020 10:37:37 +0000 (11:37 +0100)
commitd928c5828186a31c76b1553da2d07800d6761072
tree37fb81458ce8197a144376fb43f1bff03e525a48
parent793bf12f8c322438ffaec1882cce7eaed5233d4f
parent990bb34891c83d12c5129fd781893704f948f2f4
Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
  Handle mysqli errors in more cases
  Sync test with master
ext/mysqli/mysqli_api.c
ext/mysqli/tests/mysqli_report.phpt
ext/mysqlnd/mysqlnd_ps.c