Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
  fix mysqli_stmt_get_result_metadata_fetch_field test for mariadb

Author: nikic

ext/mysqli/tests/mysqli_stmt_get_result_metadata_fetch_field.phpt

@@ -175,6 +175,6 @@ object(stdClass)#%d (13) {
   ["type"]=>
   int(253)
   ["decimals"]=>
-  int(31)
+  int(3%d)
 }
 done!