Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
  Handle mysqli errors in more cases
  Sync test with master

diff --cc ext/mysqli/mysqli_api.c
Simple merge

diff --cc ext/mysqli/tests/mysqli_report.phpt
index dda3c3ec734b2b33aadd420a11f24c7c566737c6,33730976976ee9963bc88290d127fa95b1d0a45c..1dbf1e4dc19ced1d9eee2cbb04560773d1fa6863
--- 1/ext/mysqli/tests/mysqli_report.phpt
--- 2/ext/mysqli/tests/mysqli_report.phpt
+++ b/ext/mysqli/tests/mysqli_report.phpt
@@@ -292,7 -322,20 +321,19 @@@ mysqli_kill(): Argument #2 ($process_id
  Warning: mysqli_prepare(): (%d/%d): You have an error in your SQL syntax; check the manual that corresponds to your %s server version for the right syntax to use near 'FOO' at line 1 in %s on line %d
  
  Warning: mysqli_real_query(): (%d/%d): You have an error in your SQL syntax; check the manual that corresponds to your %s server version for the right syntax to use near 'FOO' at line 1 in %s on line %d
 -
 -Warning: mysqli_kill(): processid should have positive value in %s on line %d
+ 
+ Warning: mysqli_autocommit(): (%s/%d): Commands out of sync; you can't run this command now in %s on line %d
+ 
+ Warning: mysqli_commit(): (%s/%d): Commands out of sync; you can't run this command now in %s on line %d
+ 
+ Warning: mysqli_rollback(): (%s/%d): Commands out of sync; you can't run this command now in %s on line %d
+ 
+ Warning: mysqli_stmt_prepare(): (%s/%d): Commands out of sync; you can't run this command now in %s on line %d
+ 
+ Warning: mysqli_store_result(): (%s/%d): You have an error in your SQL syntax; check the manual that corresponds to your %s server version for the right syntax to use near 'FOO' at line 1 in %s on line %d
+ 
+ Warning: mysqli_stmt_attr_set(): (%s/%d): Not implemented in %s on line %d
 +mysqli_kill(): Argument #2 ($process_id) must be greater than 0
  
  Warning: mysqli_stmt_prepare(): (%d/%d): You have an error in your SQL syntax; check the manual that corresponds to your %s server version for the right syntax to use near 'FOO' at line 1 in %s on line %d
  [013] Access denied for user '%s'@'%s' (using password: YES)

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