Merge branch 'PHP-7.2' into PHP-7.3

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

diff --cc NEWS
index 8d7f205b7ab765744af8650f895d1bc4ddf53caf,31b67125f6cb093077127ef89fac7373e3c8acfc..41267187e06027d08fadbf66f5661b1955ca40b3
--- 1/NEWS
--- 2/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)

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