Merge branch 'PHP-7.2' into PHP-7.3

diff --cc NEWS
index a3cd9544edbb0eb64e34f17d89eb7a5a0a5664dd,827ed8e9a7fb009671b175fb39b1554fc390ad9e..05806e23e3e696080af2b0a122b9f8a1546b805e
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -10,15 -10,11 +10,19 @@@ PH
    . Fixed bug #78025 (segfault when accessing properties of DOMDocumentType).
      (cmb)
  
 -30 May 2019, PHP 7.2.19
+ - MySQLi:
+   . Fixed bug #77956 (When mysqli.allow_local_infile = Off, use a meaningful
+     error message). (Sjon Hortensius)
+ 
 +- Opcache:
 +  . Fixed bug #78015 (Incorrect evaluation of expressions involving partials
 +    arrays in SCCP). (Nikita)
 +
 +16 May 2019, PHP 7.3.6RC1
 +
 +- cURL:
 +  . Implemented FR #72189 (Add missing CURL_VERSION_* constants). (Javier
 +    Spagnoletti)
  
  - FPM:
    . Fixed bug #77934 (php-fpm kill -USR2 not working). (Jakub Zelenka)

diff --cc ext/mysqlnd/mysqlnd_loaddata.c
Simple merge